Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Fix Plugin Store Page Refresh Issue #3233

Open
wants to merge 3 commits into
base: dev
Choose a base branch
from

Conversation

Jack251970
Copy link
Contributor

@Jack251970 Jack251970 commented Feb 9, 2025

Fix Plugin Store Page Refresh Issue

When reupdating the plugins manifest, the user plugins cannot be updated which causes plugin store page cannot be refreshed when clicking the refresh button.

If the count of the UserPlugin is zero, FL has not loaded the plugins correctly so we need to re-fetch the plugins.

Related issue:
image

Test

Original:

2025-02-09.22-06-15.mp4

Now:

2025-02-09.21-49-04.mp4

This comment has been minimized.

Copy link
Contributor

coderabbitai bot commented Feb 9, 2025

📝 Walkthrough

Walkthrough

The pull request modifies the UpdateManifestAsync method in the PluginsManifest class, changing its return type from Task to Task<bool>. The method now checks if the results list is empty, updating the UserPlugins property and returning true if it contains items, or returning false if it is empty or an exception occurs. Additionally, changes to the SettingsPanePluginStoreViewModel class introduce null safety in the ExternalPlugins property and conditionally call OnPropertyChanged in the RefreshExternalPluginsAsync method based on the success of the manifest update.

Changes

File Change Summary
Flow.Launcher.Core/.../PluginsManifest.cs Changed return type of UpdateManifestAsync to Task<bool> and updated logic for handling results.
Flow.Launcher/.../SettingsPanePluginStoreViewModel.cs Added null-conditional operator to ExternalPlugins property and conditional check in RefreshExternalPluginsAsync.

Suggested reviewers

  • jjw24
  • taooceros

Poem

In the code where rabbits play,
Updates hop in a joyful way.
With checks for null and lists so bright,
Our plugins dance in the coding light.
Bugs retreat, and all is well,
In this garden, our logic will swell! 🐇✨


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)
Flow.Launcher.Core/ExternalPlugins/PluginsManifest.cs (1)

30-30: Consider extracting the condition to a descriptive method.

The condition combines multiple checks that represent different refresh triggers. Consider extracting it to a method for better readability.

+        private static bool ShouldUpdateManifest(bool usePrimaryUrlOnly) =>
+            UserPlugins == null || 
+            UserPlugins.Count == 0 || 
+            usePrimaryUrlOnly || 
+            DateTime.Now.Subtract(lastFetchedAt) >= fetchTimeout;
+
         public static async Task UpdateManifestAsync(CancellationToken token = default, bool usePrimaryUrlOnly = false)
         {
             try
             {
                 await manifestUpdateLock.WaitAsync(token).ConfigureAwait(false);

-                if (UserPlugins == null || UserPlugins.Count == 0 || usePrimaryUrlOnly || DateTime.Now.Subtract(lastFetchedAt) >= fetchTimeout)
+                if (ShouldUpdateManifest(usePrimaryUrlOnly))
📜 Review details

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

📥 Commits

Reviewing files that changed from the base of the PR and between e463292 and 8644027.

📒 Files selected for processing (1)
  • Flow.Launcher.Core/ExternalPlugins/PluginsManifest.cs (2 hunks)
⏰ Context from checks skipped due to timeout of 90000ms (1)
  • GitHub Check: gitStream.cm
🔇 Additional comments (1)
Flow.Launcher.Core/ExternalPlugins/PluginsManifest.cs (1)

30-30: LGTM! The fix correctly addresses the plugin refresh issue.

The added condition UserPlugins.Count == 0 ensures that the manifest is updated when no plugins are loaded, fixing the plugin store page refresh issue. The implementation maintains thread safety and proper error handling.

@prlabeler prlabeler bot added the bug Something isn't working label Feb 9, 2025
@Jack251970 Jack251970 added the Small PR Items that are short and don't have much impact. Quick reviews are good. label Feb 9, 2025
Copy link

@check-spelling-bot Report

🔴 Please review

See the 📂 files view, the 📜action log, or 📝 job summary for details.

❌ Errors Count
❌ forbidden-pattern 22
⚠️ ignored-expect-variant 1
⚠️ non-alpha-in-dictionary 19

See ❌ Event descriptions for more information.

If the flagged items are 🤯 false positives

If items relate to a ...

  • binary file (or some other file you wouldn't want to check at all).

    Please add a file path to the excludes.txt file matching the containing file.

    File paths are Perl 5 Regular Expressions - you can test yours before committing to verify it will match your files.

    ^ refers to the file's path from the root of the repository, so ^README\.md$ would exclude README.md (on whichever branch you're using).

  • well-formed pattern.

    If you can write a pattern that would match it,
    try adding it to the patterns.txt file.

    Patterns are Perl 5 Regular Expressions - you can test yours before committing to verify it will match your lines.

    Note that patterns can't match multiline strings.

Copy link

gitstream-cm bot commented Feb 10, 2025

🥷 Code experts: Yusyuriv, taooceros

Yusyuriv, taooceros have most 🧠 knowledge in the files.

See details

Flow.Launcher.Core/ExternalPlugins/PluginsManifest.cs

Knowledge based on git-blame:
taooceros: 58%

Flow.Launcher/SettingPages/ViewModels/SettingsPanePluginStoreViewModel.cs

Knowledge based on git-blame:
Yusyuriv: 100%

To learn more about /:\ gitStream - Visit our Docs

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)
Flow.Launcher.Core/ExternalPlugins/PluginsManifest.cs (1)

24-54: LGTM! Good error handling and return value.

The changes effectively address the plugin store refresh issue by:

  1. Preventing invalid updates when results are empty
  2. Providing feedback to callers through the boolean return value
  3. Maintaining robust error handling with proper resource cleanup

Consider enhancing the comment to better explain the rationale:

-    // If the results are empty, we shouldn't update the manifest because the results are invalid.
+    // Skip manifest update if results are empty to prevent clearing valid plugins when fetch fails
📜 Review details

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

📥 Commits

Reviewing files that changed from the base of the PR and between 8644027 and 319f016.

📒 Files selected for processing (2)
  • Flow.Launcher.Core/ExternalPlugins/PluginsManifest.cs (4 hunks)
  • Flow.Launcher/SettingPages/ViewModels/SettingsPanePluginStoreViewModel.cs (2 hunks)
⏰ Context from checks skipped due to timeout of 90000ms (1)
  • GitHub Check: gitStream.cm
🔇 Additional comments (2)
Flow.Launcher/SettingPages/ViewModels/SettingsPanePluginStoreViewModel.cs (2)

16-22: LGTM! Good defensive programming.

The addition of the null-conditional operator improves robustness by safely handling cases where UserPlugins might be null, preventing potential null reference exceptions.


24-31: LGTM! Good UI update control.

The conditional check ensures that the UI is only refreshed when the manifest update is successful, preventing unnecessary UI updates and improving user experience.

# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
1 min review bug Something isn't working Small PR Items that are short and don't have much impact. Quick reviews are good.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant