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

Select all OOIS for Aggregate Reports #2222

Merged
merged 41 commits into from
Feb 8, 2024
Merged

Select all OOIS for Aggregate Reports #2222

merged 41 commits into from
Feb 8, 2024

Conversation

Rieven
Copy link
Contributor

@Rieven Rieven commented Dec 29, 2023 •
edited by underdarknl
Loading

Changes

Select all OOIs for current organization, this will take all OOIs

Preselection =

  • 'Declared' clearance type/scan profile
  • Clearance levels: L2, L3, L4

Based on the user filters starting with above filters, the filters will be applied in the final report.

Issue link

#2174

#2174

Demo

Screen.Recording.2023-12-29.at.15.09.01.mov

Show selected OOIs in Appendix
image

PDF Selected OOIs:
image

Code Checklist

  • All the commits in this PR are properly PGP-signed and verified;
  • This PR only contains functionality relevant to the issue; tickets have been created for newly discovered issues.
  • I have written unit tests for the changes or fixes I made.
  • For any non-trivial functionality, I have added integration and/or end-to-end tests.
  • I have performed a self-review of my code and refactored it to the best of my abilities.

Communication

  • I have informed others of any required .env changes files if required and changed the .env-dist accordingly.
  • I have made corresponding changes to the documentation, if necessary.

Checklist for code reviewers:

Copy-paste the checklist from the docs/source/templates folder into your comment.

Checklist for QA:

Copy-paste the checklist from the docs/source/templates folder into your comment.

@Rieven Rieven requested a review from a team as a code owner December 29, 2023 14:02
@Rieven Rieven self-assigned this Dec 29, 2023
dekkers
dekkers reviewed Jan 4, 2024
View reviewed changes
rocky/reports/templates/partials/report_types_selection.html Outdated Show resolved Hide resolved
rocky/reports/templates/partials/report_types_selection.html Outdated Show resolved Hide resolved
rocky/reports/report_types/aggregate_organisation_report/appendix.html Outdated Show resolved Hide resolved
rocky/reports/templates/partials/report_ooi_list.html Show resolved Hide resolved
rocky/reports/views/base.py Outdated Show resolved Hide resolved
rocky/reports/views/base.py Outdated Show resolved Hide resolved
rocky/rocky/views/ooi_view.py Show resolved Hide resolved
dekkers
dekkers reviewed Jan 5, 2024
View reviewed changes
Copy link
Contributor

@dekkers dekkers left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't do a full QA, but when checking the form things I saw that:

  • Multi report gives an exception
  • Selecting all objects isn't available with generate report.

rocky/reports/views/base.py Show resolved Hide resolved
rocky/reports/report_types/aggregate_organisation_report/appendix.html Outdated Show resolved Hide resolved
@stephanie0x00
Copy link
Contributor

Checklist for QA:

  • I have checked out this branch, and successfully ran a fresh make reset.
  • I confirmed that there are no unintended functional regressions in this branch:
    • I have managed to pass the onboarding flow
    • Objects and Findings are created properly
    • Tasks are created and completed properly
  • I confirmed that the PR's advertised feature or hotfix works as intended.

What works:

I observe the new banner suggesting to select all OOIs. The aggregate reports then also shows all OOIs in the report. So it seems to work from a QA perspective.

What doesn't work:

N/a

Bug or feature?:

N/a

ammar92
ammar92 previously approved these changes Jan 18, 2024
View reviewed changes
Copy link
Contributor

@ammar92 ammar92 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me. Only one small merge conflict left, should be doable.

Rieven and others added 17 commits January 30, 2024 11:55
@Rieven
Fix soem logic and looping
cdc7744
@Rieven @dekkers
Update rocky/reports/report_types/aggregate_organisation_report/appen…
fec4cd9 
…dix.html

Co-authored-by: Jeroen Dekkers <[email protected]>
@Rieven
Merge branch 'main' into feature/reports-select-all-oois-org
f5196ee
@Rieven
fix lang
c078cb2
@Rieven
Merge branch 'feature/reports-select-all-oois-org' of github.com:minv…
1102fc7 
…ws/nl-kat-coordination into feature/reports-select-all-oois-org
@Rieven
fix lang
0133dbd
@Rieven
Fix test
050698c
@Rieven
Merge branch 'main' into feature/reports-select-all-oois-org
82f99f7
@Rieven
Merge branch 'main' into feature/reports-select-all-oois-org
8a739a1
@Rieven
fix test
4cf326f
@Rieven
Merge branch 'main' into feature/reports-select-all-oois-org
2b820be
@Rieven
Merge branch 'main' into feature/reports-select-all-oois-org
a08c200
@Rieven
Merge branch 'main' of github.com:minvws/nl-kat-coordination into fea…
139fad2 
…ture/reports-select-all-oois-org
@Rieven
Merge branch 'main' of github.com:minvws/nl-kat-coordination into fea…
ffcabf0 
…ture/reports-select-all-oois-org
@Rieven
Merge branch 'main' into feature/reports-select-all-oois-org
c853aaf
@Rieven
Merge branch 'main' into feature/reports-select-all-oois-org
81c890b
@stephanie0x00
Merge branch 'main' into feature/reports-select-all-oois-org
4e1af87
@stephanie0x00
Copy link
Contributor

Checklist for QA:

  • I have checked out this branch, and successfully ran a fresh make reset.
  • I confirmed that there are no unintended functional regressions in this branch:
    • I have managed to pass the onboarding flow
    • Objects and Findings are created properly
    • Tasks are created and completed properly
  • I confirmed that the PR's advertised feature or hotfix works as intended.

What works:

The changes after the last QA do not appear to break anything. So ready for merge after code review is done.

What doesn't work:

n/a

Bug or feature?:

n/a

@underdarknl underdarknl merged commit 82cdbb7 into main Feb 8, 2024
12 checks passed
@underdarknl underdarknl deleted the feature/reports-select-all-oois-org branch February 8, 2024 15:06
jpbruinsslot added a commit that referenced this pull request Feb 8, 2024
@jpbruinsslot
Merge branch 'main' into chore/mula/update-architecture-doc
30bcbe4 
* main:
  Select all OOIS for Aggregate Reports (#2222)
  Add timeouts to CVE API downloader (#2455)
  Fix/normalizer produces, list was empty. is now populated and links to object page (#2411)
  Add mypy and application bootstrap test to boefjes (#2460)
  Add traces for pop and push to queue in scheduler (#2467)
  Feature/report benchmarks (#2447)
  Hotfix for default arg (#2458)
  Fix argument order and hence avoid the octopoes factory (#2454)
  upgrade forcediphttpsadapter (#2453)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dekkers dekkers dekkers left review comments

@underdarknl underdarknl underdarknl approved these changes

@ammar92 ammar92 ammar92 left review comments

Assignees

@Rieven Rieven

Labels
None yet
Projects
KAT
Archived in project
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@Rieven @stephanie0x00 @dekkers @underdarknl @ammar92