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

Sub reports for Aggregate Report #3852

Merged
merged 13 commits into from
Nov 21, 2024
Merged

Conversation

Rieven
Copy link
Contributor

@Rieven Rieven commented Nov 18, 2024

Changes

The initial idea was to show also sub reports for Aggregate Report. This was missing, it was only available in bytes but we can see al sub reports which contributed to the Aggregation of these sub reports into the Aggregate Report.

Issue link

#3805

Closes #3805

Demo

image

All sub reports for Aggregate Report:
image

QA notes

Please add some information for QA on how to test the newly created code.


Code Checklist

  • All the commits in this PR are properly PGP-signed and verified.
  • This PR only contains functionality relevant to the issue.
  • I have written unit tests for the changes or fixes I made.
  • I have checked the documentation and made changes where necessary.
  • I have performed a self-review of my code and refactored it to the best of my abilities.
  • Tickets have been created for newly discovered issues.
  • For any non-trivial functionality, I have added integration and/or end-to-end tests.
  • I have informed others of any required .env changes files if required and changed the .env-dist accordingly.
  • I have included comments in the code to elaborate on what is not self-evident from the code itself, including references to issues and discussions online, or implicit behavior of an interface.

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 November 18, 2024 16:41
@Rieven Rieven changed the title Subreports for Aggregate Report Sub reports for Aggregate Report Nov 18, 2024
@Rieven Rieven self-assigned this Nov 18, 2024
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.

Tiny suggestion, looks good otherwise

rocky/reports/views/mixins.py Outdated Show resolved Hide resolved
@stephanie0x00
Copy link
Contributor

stephanie0x00 commented Nov 21, 2024

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.
  • I checked the logs for errors and/or warnings and made issues where necessary

What works:

Aggregate reports are available again! The bugs described below are picked up in separate PRs.

What doesn't work:

See below.

Bug or feature?:

image

image

Copy link

sonarcloud bot commented Nov 21, 2024

Quality Gate Failed Quality Gate failed

Failed conditions
78.7% Coverage on New Code (required ≥ 80%)

See analysis details on SonarQube Cloud

@underdarknl underdarknl merged commit 1a0299d into main Nov 21, 2024
20 of 22 checks passed
@underdarknl underdarknl deleted the fix/aggregate_report_sub_reports branch November 21, 2024 12:56
jpbruinsslot added a commit that referenced this pull request Nov 27, 2024
* main: (60 commits)
  Increase max number of PostgreSQL connections (#3889)
  Fix for task id as valid UUID (#3744)
  Add `auto_calculate_deadline` attribute to Scheduler (#3869)
  Ignore specific url parameters when following location headers (#3856)
  Let mailserver inherit l1 (#3704)
  Change plugins enabling in report flow to checkboxes (#3747)
  Fix rocky katalogus tests and delete unused fixtures (#3884)
  Enable/disable scheduled reports (#3871)
  optimize locking in katalogus.py, reuse available data (#3752)
  Updates boefje clearances and descriptions (#3863)
  Fixes for empty tables (#3844)
  Fix cron for last day of the month (#3831)
  Sub reports for Aggregate Report (#3852)
  Add start time to scheduled reports (#3809)
  Add configuration setting for number of octopoes workers (#3796)
  Limit requesting prior tasks for ranking in scheduler (#3836)
  Let local plugins (files) take precedence over database entries (#3858)
  Skip empty queues in the Rocky worker (#3860)
  Report types listed in a modal @ report plugins (#3718)
  Support a Schedule without a schedule in scheduler (#3834)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Aggregate report misses reports
4 participants