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

Fix station sorting #127

Merged
merged 1 commit into from
Feb 7, 2025
Merged

Fix station sorting #127

merged 1 commit into from
Feb 7, 2025

Conversation

justinshannon
Copy link
Contributor

@justinshannon justinshannon commented Feb 7, 2025

Sort by connections status, identifier then ATIS type

Summary by CodeRabbit

  • Refactor
    • Enhanced the ordering of station listings so they now display more intuitively based on connection status and station type.
    • Refined filtering to present connected stations in a more organized and user-friendly manner.

Sort by connections status, identifier then ATIS type
Copy link
Contributor

coderabbitai bot commented Feb 7, 2025

Walkthrough

This pull request refines the sorting and filtering logic in the application’s main view model for ATIS stations. The changes adjust the order of ATIS station view models by updating the priority for different network connection statuses and introducing a new ordering based on ATIS type. Additionally, the code now includes an extra using directive to incorporate types from an external profiles models namespace.

Changes

File(s) Change Summary
vATIS.Desktop/Ui/.../MainWindowViewModel.cs Modified sorting logic: updated NetworkConnectionStatus priorities (Observer now 1 instead of 0; default now 2) and added a new AtisType-based sorting sequence. Refactored filtering logic and added a new using directive for Vatsim.Vatis.Profiles.Models.

Sequence Diagram(s)

sequenceDiagram
    participant UI as User Interface
    participant VM as MainWindowViewModel
    participant SL as Sorting & Filtering Logic

    UI->>VM: Trigger update of ATIS stations
    VM->>SL: Execute sorting (by NetworkConnectionStatus & AtisType)
    SL->>VM: Return sorted and filtered station list
    VM->>UI: Update display with new station order
Loading

Possibly related PRs

Poem

I'm a little rabbit, hopping through the code,
Sorting ATIS stations down the winding road.
With status now tweaked and types in line,
My UI dances in a rhythm so fine.
Carrots and code in a joyful mix,
Hopping high with these clever new tricks!


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
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: 0

🧹 Nitpick comments (1)
vATIS.Desktop/Ui/ViewModels/MainWindowViewModel.cs (1)

130-139: Consider extracting the ATIS type sorting logic to reduce duplication.

The ATIS type sorting logic is duplicated between the main sorting and the connected stations sorting. Consider extracting it into a reusable expression.

+    private static int GetAtisTypeSortOrder(AtisType type) => type switch
+    {
+        AtisType.Combined => 0,
+        AtisType.Arrival => 1,
+        AtisType.Departure => 2,
+        _ => 3
+    };

     // In the main sorting
-    .ThenBy(i => i.AtisType switch
-    {
-        AtisType.Combined => 0,
-        AtisType.Arrival => 1,
-        AtisType.Departure => 2,
-        _ => 3
-    })
+    .ThenBy(i => GetAtisTypeSortOrder(i.AtisType))

     // In the connected stations sorting
-    .ThenBy(i => i.AtisType switch
-    {
-        AtisType.Combined => 0,
-        AtisType.Arrival => 1,
-        AtisType.Departure => 2,
-        _ => 3
-    })
+    .ThenBy(i => GetAtisTypeSortOrder(i.AtisType))
📜 Review details

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

📥 Commits

Reviewing files that changed from the base of the PR and between 0527dae and 0bfe97a.

📒 Files selected for processing (1)
  • vATIS.Desktop/Ui/ViewModels/MainWindowViewModel.cs (3 hunks)
⏰ Context from checks skipped due to timeout of 90000ms (7)
  • GitHub Check: build (macos-latest)
  • GitHub Check: build (windows-latest)
  • GitHub Check: Analyze (cpp)
  • GitHub Check: build (ubuntu-latest)
  • GitHub Check: Analyze (csharp)
  • GitHub Check: Analyze (cpp)
  • GitHub Check: Analyze (csharp)
🔇 Additional comments (2)
vATIS.Desktop/Ui/ViewModels/MainWindowViewModel.cs (2)

27-27: LGTM!

The addition of the Profiles.Models namespace is necessary for the ATIS type-based sorting functionality.


96-106: LGTM! Verify the sorting priorities.

The sorting logic aligns with the PR objectives, implementing a three-tier sorting system:

  1. Connection status (Connected > Observer > Others)
  2. Identifier
  3. ATIS type (Combined > Arrival > Departure > Others)

Please confirm if this sorting priority matches the expected user experience:

  1. Should Combined ATIS have the highest priority over Arrival and Departure?
  2. Should Connected stations always appear before Observer stations?

@justinshannon justinshannon added this pull request to the merge queue Feb 7, 2025
Merged via the queue into main with commit e833d76 Feb 7, 2025
9 checks passed
@justinshannon justinshannon deleted the fix/station-sorting branch February 7, 2025 22:05
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