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

Enable/disable scheduled reports #3871

Merged
merged 20 commits into from
Nov 26, 2024
Merged

Enable/disable scheduled reports #3871

merged 20 commits into from
Nov 26, 2024

Conversation

madelondohmen
Copy link
Contributor

Changes

This PR makes it possible to disable and enable scheduled reports.
It also makes some changes in the scheduled reports table conform the new design (see ticket).

Besides this, I've created enable/disable tags that haven't been implemented as a component yet. That's why I've implemented it the same way as how it's done for the grey label ("tags-color-grey-2").

Issue link

Closes #3124

Demo

Opname.2024-11-20.161301.mp4

QA notes

  • Create a report and schedule it
  • You'll be directed to the scheduled reports page
  • Expand the row of the created report
  • Click on "Disable schedule" --> Check if it works as intended
  • Expand the row of the created report
  • Click on "Enable schedule" --> Check if it works as intended

Check the video for an example.

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.

@madelondohmen madelondohmen self-assigned this Nov 21, 2024
@madelondohmen madelondohmen requested a review from a team as a code owner November 21, 2024 07:56
@madelondohmen madelondohmen marked this pull request as draft November 21, 2024 08:23
@madelondohmen madelondohmen marked this pull request as ready for review November 21, 2024 10:48
ammar92
ammar92 reviewed Nov 24, 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.

Tiny suggestions, looks good otherwise

rocky/reports/templates/report_overview/scheduled_reports_table.html Outdated Show resolved Hide resolved
rocky/reports/templates/report_overview/scheduled_reports_table.html 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.
  • I checked the logs for errors and/or warnings and made issues where necessary

What works:

Seems to work. Added two scheduled reports, enabled one and disabled the other one, then re-enabled one to check if it was picked up. Changed the cron to create a report every minute while the schedule was disabled to see if this would trigger a schedule.

What doesn't work:

n/a

Bug or feature?:

n/a

@sonarcloud SonarCloud
Copy link

sonarcloud bot commented Nov 25, 2024

Quality Gate Failed Quality Gate failed

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

See analysis details on SonarQube Cloud

@underdarknl underdarknl merged commit 1589b0a into main Nov 26, 2024
20 of 22 checks passed
@underdarknl underdarknl deleted the feature/disable-scheduled-reports branch November 26, 2024 09:10
jpbruinsslot added a commit that referenced this pull request Nov 27, 2024
@jpbruinsslot
Merge branch 'main' into feature/mula/restructure-folders
66e358a 
* main:
  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)
jpbruinsslot added a commit that referenced this pull request Nov 27, 2024
@jpbruinsslot
Merge branch 'main' into feat/optimize-katalogus-seeding
a9ba555 
* 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)
  ...
jpbruinsslot added a commit that referenced this pull request Dec 2, 2024
@jpbruinsslot
Merge branch 'main' into poc/mula/combined-schedulers
d602c08 
* main: (64 commits)
  Bug fix: KAT-alogus parameter is now organization member instead of organization code (#3895)
  Remove sigrid workflows (#3920)
  Updated packages (#3898)
  Fix mula migrations Debian package (#3919)
  Adds loggers to report flow (#3872)
  Add additional check if task already run for report scheduler (#3900)
  Create separate finding for Microsoft RDP port (#3882)
  fix: 🐛 allow boefje completion with 404 (#3893)
  Feature/improve rename bulk modal (#3885)
  Update scheduler folder structure (#3883)
  Translations update from Hosted Weblate (#3870)
  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)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ammar92 ammar92 ammar92 left review comments

@underdarknl underdarknl underdarknl approved these changes

Assignees

@madelondohmen madelondohmen

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Cancel the scheduled reports
5 participants
@madelondohmen @stephanie0x00 @underdarknl @ammar92 @TwistMeister