Skip to content

fix: sort results lexicographically by labels in their order of appearance#3293

Merged
johanneskoester merged 2 commits intomainfrom
fix/report-sorting
Feb 14, 2025
Merged

fix: sort results lexicographically by labels in their order of appearance#3293
johanneskoester merged 2 commits intomainfrom
fix/report-sorting

Conversation

@johanneskoester
Copy link
Copy Markdown
Contributor

@johanneskoester johanneskoester commented Feb 14, 2025

QC

  • The PR contains a test case for the changes or the changes are already covered by an existing test case.
  • The documentation (docs/) is updated to reflect the changes or this is not necessary (e.g. if the change does neither modify the language nor the behavior or functionalities of Snakemake).

Summary by CodeRabbit

  • New Features
    • Enhanced Results Display: Results are now organized and sorted for clearer, more intuitive presentation.
    • Improved Navigation: Clicking the breadcrumb now takes you back to the main menu, streamlining the navigation experience.

@coderabbitai
Copy link
Copy Markdown
Contributor

coderabbitai bot commented Feb 14, 2025

Caution

Review failed

The pull request is closed.

📝 Walkthrough

Walkthrough

The changes update two components within the HTML reporter. In the AbstractResults class, the renderEntries method now organizes result data into an array of entry objects containing key, path, and labels, sorts these entries lexicographically, and renders table cells based on the new structure. In the Navbar class, the getResultBreadcrumb method is modified to return a breadcrumb object where the func property is now a function. This function, when executed, sets the view to "menu" mode and clears the category and subcategory states.

Changes

File(s) Change Summary
snakemake/report/html_reporter/template/components/abstract_results.js Refactored the renderEntries method to map results into entry objects with key, path, and labels. Entries are sorted lexicographically by labels and rendered using <td> cells.
snakemake/report/html_reporter/template/components/navbar.js Updated getResultBreadcrumb to return a breadcrumb object with func defined as a function that sets the view to "menu" and clears category and subcategory values.

Sequence Diagram(s)

sequenceDiagram
    participant U as User
    participant N as Navbar
    participant VM as View Manager

    U->>N: Clicks on breadcrumb
    N->>N: Executes getResultBreadcrumb()
    U->>N: Invokes returned breadcrumb function
    N->>VM: Calls setView("menu", clear category and subcategory)
    VM-->>N: Updates the UI view to menu mode
Loading

📜 Recent review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 68450b2 and 05da96b.

📒 Files selected for processing (1)
  • snakemake/report/html_reporter/template/components/abstract_results.js (3 hunks)

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR. (Beta)
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Copy link
Copy Markdown
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 1

🔭 Outside diff range comments (1)
snakemake/report/html_reporter/template/components/abstract_results.js (1)

94-96: 🛠️ Refactor suggestion

Move PropTypes declaration to class level.

PropTypes should be declared at the class level, not inside the renderEntries method. This improves code organization and prevents unnecessary re-declarations.

Move the PropTypes declaration outside the method:

class AbstractResults extends React.Component {
+    static propTypes = {
+        app: PropTypes.object.isRequired,
+    };
+
    render() {
        // ... existing code ...
    }

    renderEntries() {
-        AbstractResults.propTypes = {
-            app: PropTypes.object.isRequired,
-        };
📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 8cfff37 and 68450b2.

📒 Files selected for processing (2)
  • snakemake/report/html_reporter/template/components/abstract_results.js (3 hunks)
  • snakemake/report/html_reporter/template/components/navbar.js (1 hunks)
⏰ Context from checks skipped due to timeout of 90000ms (30)
  • GitHub Check: testing (10, 3.12)
  • GitHub Check: testing (10, 3.11)
  • GitHub Check: testing (9, 3.12)
  • GitHub Check: testing (9, 3.11)
  • GitHub Check: testing (8, 3.12)
  • GitHub Check: testing (8, 3.11)
  • GitHub Check: testing (7, 3.12)
  • GitHub Check: testing (7, 3.11)
  • GitHub Check: testing (6, 3.12)
  • GitHub Check: testing (6, 3.11)
  • GitHub Check: testing (5, 3.12)
  • GitHub Check: testing (5, 3.11)
  • GitHub Check: testing-windows (10)
  • GitHub Check: testing (4, 3.12)
  • GitHub Check: testing-windows (9)
  • GitHub Check: testing-windows (8)
  • GitHub Check: testing (4, 3.11)
  • GitHub Check: testing-windows (7)
  • GitHub Check: testing (3, 3.12)
  • GitHub Check: testing-windows (6)
  • GitHub Check: testing (3, 3.11)
  • GitHub Check: testing-windows (5)
  • GitHub Check: testing (2, 3.12)
  • GitHub Check: testing-windows (4)
  • GitHub Check: testing (2, 3.11)
  • GitHub Check: testing-windows (3)
  • GitHub Check: testing (1, 3.12)
  • GitHub Check: testing-windows (2)
  • GitHub Check: testing (1, 3.11)
  • GitHub Check: testing-windows (1)
🔇 Additional comments (3)
snakemake/report/html_reporter/template/components/navbar.js (1)

208-209: LGTM! Improved navigation behavior.

The changes enhance the user experience by adding proper navigation functionality to the "Results" breadcrumb, allowing users to return to the menu view. The implementation is clean and consistent with other breadcrumb methods.

snakemake/report/html_reporter/template/components/abstract_results.js (2)

103-121: Well-structured entry object creation!

The mapping of results to entry objects is clean and handles both labelled and unlabelled cases appropriately. The key generation is suitable for React's list rendering requirements.


133-169: Clean and efficient entry rendering implementation!

The rendering logic follows React best practices with proper key usage and maintains a clean table structure.

@sonarqubecloud
Copy link
Copy Markdown

@johanneskoester johanneskoester merged commit a19a0ac into main Feb 14, 2025
28 of 29 checks passed
@johanneskoester johanneskoester deleted the fix/report-sorting branch February 14, 2025 14:01
johanneskoester pushed a commit that referenced this pull request Feb 27, 2025
🤖 I have created a release *beep* *boop*
---


##
[8.29.0](v8.28.0...v8.29.0)
(2025-02-27)


### Features

* provide mechanism to link between report items (snakemake.report_href,
see docs) ([#3224](#3224))
([a024e60](a024e60))
* toggles for binary labels in report
([#3296](#3296))
([7690998](7690998))


### Bug Fixes

* add missing [@conda](https://github.com/conda) annotations
([#3298](#3298))
([0b541cc](0b541cc))
* properly handle remote storage when waiting for pipes
([#3317](#3317))
([9f7e092](9f7e092))
* provide proper error messages if output file preparation (pipe, mkdir)
fails ([#3309](#3309))
([77ef176](77ef176))
* record file extension (e.g. .tsv) in between workflow cache records in
order to avoid that files of the wrong format are erroneously returned
by the cache. This will lead to some cache misses. But avoiding errors
induced by the previous behavior of ignoring file extensions when
seeking for cache records is more important.
([#3314](#3314))
([4912f00](4912f00))
* sort results lexicographically by labels in their order of appearance
([#3293](#3293))
([a19a0ac](a19a0ac))


### Documentation

* update best practices
([7270eb3](7270eb3))

---
This PR was generated with [Release
Please](https://github.com/googleapis/release-please). See
[documentation](https://github.com/googleapis/release-please#release-please).

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
kjohnsen pushed a commit to kjohnsen/snakemake that referenced this pull request Dec 15, 2025
…rance (snakemake#3293)

<!--Add a description of your PR here-->

### QC
<!-- Make sure that you can tick the boxes below. -->

* [x] The PR contains a test case for the changes or the changes are
already covered by an existing test case.
* [x] The documentation (`docs/`) is updated to reflect the changes or
this is not necessary (e.g. if the change does neither modify the
language nor the behavior or functionalities of Snakemake).


<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->

## Summary by CodeRabbit

- **New Features**
- **Enhanced Results Display:** Results are now organized and sorted for
clearer, more intuitive presentation.
- **Improved Navigation:** Clicking the breadcrumb now takes you back to
the main menu, streamlining the navigation experience.

<!-- end of auto-generated comment: release notes by coderabbit.ai -->
kjohnsen pushed a commit to kjohnsen/snakemake that referenced this pull request Dec 15, 2025
🤖 I have created a release *beep* *boop*
---


##
[8.29.0](snakemake/snakemake@v8.28.0...v8.29.0)
(2025-02-27)


### Features

* provide mechanism to link between report items (snakemake.report_href,
see docs) ([snakemake#3224](snakemake#3224))
([a024e60](snakemake@a024e60))
* toggles for binary labels in report
([snakemake#3296](snakemake#3296))
([7690998](snakemake@7690998))


### Bug Fixes

* add missing [@conda](https://github.com/conda) annotations
([snakemake#3298](snakemake#3298))
([0b541cc](snakemake@0b541cc))
* properly handle remote storage when waiting for pipes
([snakemake#3317](snakemake#3317))
([9f7e092](snakemake@9f7e092))
* provide proper error messages if output file preparation (pipe, mkdir)
fails ([snakemake#3309](snakemake#3309))
([77ef176](snakemake@77ef176))
* record file extension (e.g. .tsv) in between workflow cache records in
order to avoid that files of the wrong format are erroneously returned
by the cache. This will lead to some cache misses. But avoiding errors
induced by the previous behavior of ignoring file extensions when
seeking for cache records is more important.
([snakemake#3314](snakemake#3314))
([4912f00](snakemake@4912f00))
* sort results lexicographically by labels in their order of appearance
([snakemake#3293](snakemake#3293))
([a19a0ac](snakemake@a19a0ac))


### Documentation

* update best practices
([7270eb3](snakemake@7270eb3))

---
This PR was generated with [Release
Please](https://github.com/googleapis/release-please). See
[documentation](https://github.com/googleapis/release-please#release-please).

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
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.

1 participant