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

Sorting OOI List table by object type or clearance level #3320

Merged
merged 26 commits into from
Aug 28, 2024

Conversation

Rieven
Copy link
Contributor

@Rieven Rieven commented Aug 5, 2024

Changes

Will add 2 sorting buttons in table header:

  1. For object type
  2. For clearance level
  3. Ascending and Descending depends on the first state, so if the state was ascending, the next button press will be descending. If other button is pressed then it will jump back to no state, this depends now on which column is sorted.
  4. Default sorting is set to Type (object_type) with ascending sorting order.
  5. @HeleenSG did the styling of the buttons. Thank you! :)
  6. Depends on the branch made by @noamblitz (Search and sorting OOIs #3262) were it adds backend compatibility to sort OOI List. 2 new parameters is added: order_by and asc_desc

Issue link

Closes #2735
Closes #3253

Demo

Please add some proof in the form of screenshots or screen recordings to show (off) new functionality, if there are interesting new features for end-users.

QA notes


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 changed the title Feature/sort ooi type clearance level Sorting OOI List table by object type or clearance level Aug 5, 2024
@stephanie0x00 stephanie0x00 mentioned this pull request Aug 6, 2024
9 tasks
Rieven added 2 commits August 14, 2024 11:23
…nvws/nl-kat-coordination into feature/sort-ooi-type-clearance-level
@CLAassistant
Copy link

CLAassistant commented Aug 14, 2024

CLA assistant check
All committers have signed the CLA.

@Rieven Rieven marked this pull request as ready for review August 14, 2024 11:54
@Rieven Rieven requested a review from a team as a code owner August 14, 2024 11:54
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 in general; I have left one suggestion for the sorting properties

rocky/rocky/views/ooi_view.py Outdated Show resolved Hide resolved
Co-authored-by: Jan Klopper <[email protected]>
Co-authored-by: Rieven <[email protected]>
Co-authored-by: Jeroen Dekkers <[email protected]>
An error occurred while trying to automatically change base from feature/search to main August 23, 2024 08:36
@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 as expected. You can click on the Type and Clearance level on the Objects page and it will switch between ASC and DESC sorting. This also works when you have a search entry e.g. 'mispo.es'.

What doesn't work:

n/a

Bug or feature?:

n/a

…n into feature/sort-ooi-type-clearance-level
@underdarknl underdarknl merged commit 02578ad into feature/search Aug 28, 2024
41 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

8 participants