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: update toolbar server status on sync #4075

Open
wants to merge 7 commits into
base: master
Choose a base branch
from

Conversation

p-payet
Copy link

@p-payet p-payet commented Jan 2, 2025

Fixes #3128

Listen to sync-event to update user data when sync status changed, so userData.offline is up to date and server status displayed is valid.

…n sync status changed, so 'userData.offline' is up to date and server status displayed is valid
@actual-github-bot actual-github-bot bot changed the title Fix: update toolbar server status on sync [WIP] Fix: update toolbar server status on sync Jan 2, 2025
Copy link

netlify bot commented Jan 2, 2025

Deploy Preview for actualbudget ready!

Name Link
🔨 Latest commit e254fc6
🔍 Latest deploy log https://app.netlify.com/sites/actualbudget/deploys/6777b3a90d5b8a0008cc0236
😎 Deploy Preview https://deploy-preview-4075.demo.actualbudget.org
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

Copy link
Contributor

github-actions bot commented Jan 2, 2025

Bundle Stats — desktop-client

Hey there, this message comes from a GitHub action that helps you and reviewers to understand how these changes affect the size of this project's bundle.

As this PR is updated, I'll keep you updated on how the bundle size is impacted.

Total

Files count Total bundle size % Changed
10 5.64 MB → 5.64 MB (+575 B) +0.01%
Changeset
File Δ Size
src/components/LoggedInUser.tsx 📈 +575 B (+10.01%) 5.61 kB → 6.17 kB
View detailed bundle breakdown

Added

No assets were added

Removed

No assets were removed

Bigger

Asset File Size % Changed
static/js/index.js 3.71 MB → 3.71 MB (+575 B) +0.01%

Smaller

No assets were smaller

Unchanged

Asset File Size % Changed
static/js/resize-observer.js 18.37 kB 0%
static/js/workbox-window.prod.es5.js 5.69 kB 0%
static/js/AppliedFilters.js 10.24 kB 0%
static/js/useAccountPreviewTransactions.js 1.63 kB 0%
static/js/indexeddb-main-thread-worker-e59fee74.js 13.5 kB 0%
static/js/BackgroundImage.js 122.29 kB 0%
static/js/narrow.js 83.36 kB 0%
static/js/wide.js 104.11 kB 0%
static/js/ReportRouter.js 1.58 MB 0%

Copy link
Contributor

github-actions bot commented Jan 2, 2025

Bundle Stats — loot-core

Hey there, this message comes from a GitHub action that helps you and reviewers to understand how these changes affect the size of this project's bundle.

As this PR is updated, I'll keep you updated on how the bundle size is impacted.

Total

Files count Total bundle size % Changed
1 1.33 MB 0%

Changeset

No files were changed

View detailed bundle breakdown

Added

No assets were added

Removed

No assets were removed

Bigger

No assets were bigger

Smaller

No assets were smaller

Unchanged

Asset File Size % Changed
kcab.worker.js 1.33 MB 0%

@p-payet p-payet changed the title [WIP] Fix: update toolbar server status on sync Fix: update toolbar server status on sync Jan 2, 2025
Copy link
Contributor

coderabbitai bot commented Jan 2, 2025

Warning

There were issues while running some tools. Please review the errors and either fix the tool’s configuration or disable the tool if it’s a critical failure.

🔧 eslint

If the error stems from missing dependencies, add them to the package.json file. For unrecoverable errors (e.g., due to private dependencies), disable the tool in the CodeRabbit configuration.

packages/desktop-client/src/components/LoggedInUser.tsx

Oops! Something went wrong! :(

ESLint: 8.57.1

ESLint couldn't find the plugin "eslint-plugin-eslint-plugin".

(The package "eslint-plugin-eslint-plugin" was not found when loaded as a Node module from the directory "/packages/eslint-plugin-actual".)

It's likely that the plugin isn't installed correctly. Try reinstalling by running the following:

npm install eslint-plugin-eslint-plugin@latest --save-dev

The plugin "eslint-plugin-eslint-plugin" was referenced from the config file in "packages/eslint-plugin-actual/.eslintrc.js".

If you still can't figure out the problem, please stop by https://eslint.org/chat/help to chat with the team.

Walkthrough

The pull request modifies the LoggedInUser component in the desktop client, introducing changes to how user data is initialized and synchronized. A new import of the listen function from the platform client fetch module is added. The component now includes an enhanced initializeUserData function within a useEffect hook to manage user data fetching and loading states. Additionally, a new useEffect hook is implemented to listen for 'sync-event' messages, dynamically updating the loading state based on different synchronization event types.

Assessment against linked issues

Objective Addressed Explanation
Resolve "server offline" status persistence
Improve sync status update mechanism

Suggested labels

:sparkles: Merged

Suggested reviewers

  • youngcw
  • matt-fidd

📜 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 b8743b3 and e254fc6.

📒 Files selected for processing (1)
  • packages/desktop-client/src/components/LoggedInUser.tsx (2 hunks)
🚧 Files skipped from review as they are similar to previous changes (1)
  • packages/desktop-client/src/components/LoggedInUser.tsx

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

🧹 Nitpick comments (1)
packages/desktop-client/src/components/LoggedInUser.tsx (1)

56-59: Potential error handling enhancement.

initializeUserData immediately sets loading to false after getUserData() completes. If getUserData() fails, it could lead to inconsistent loading states or unhandled exceptions. Consider wrapping getUserData() in a try/catch and handling errors accordingly.

 const initializeUserData = async () => {
-  await dispatch(getUserData());
-  setLoading(false);
+  try {
+    await dispatch(getUserData());
+  } catch (e) {
+    console.error('Failed to fetch user data:', e);
+  } finally {
+    setLoading(false);
+  }
};
📜 Review details

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

📥 Commits

Reviewing files that changed from the base of the PR and between 928260c and 2b6549d.

⛔ Files ignored due to path filters (1)
  • upcoming-release-notes/4075.md is excluded by !**/*.md
📒 Files selected for processing (1)
  • packages/desktop-client/src/components/LoggedInUser.tsx (2 hunks)
🧰 Additional context used
🪛 GitHub Check: typecheck
packages/desktop-client/src/components/LoggedInUser.tsx

[failure] 74-74:
'userData' is possibly 'null'.


[failure] 75-75:
'userData' is possibly 'null'.


[failure] 83-83:
'userData' is possibly 'null'.

🔇 Additional comments (2)
packages/desktop-client/src/components/LoggedInUser.tsx (2)

8-8: Import path verification.

The import path for listen looks correct. Ensure that this import doesn't inadvertently bring in additional code or dependencies that aren't required, and confirm that there's no duplication of event listeners elsewhere.


61-62: Initialization approach looks good.

Calling initializeUserData() upon mounting meets the PR objective of ensuring the user data is loaded initially. Just be mindful of whether or not you also want to re-invoke this logic in other relevant scenarios.

packages/desktop-client/src/components/LoggedInUser.tsx Outdated Show resolved Hide resolved
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: 2

🧹 Nitpick comments (1)
packages/desktop-client/src/components/LoggedInUser.tsx (1)

61-62: Consider handling cleanup for initialization.

While the initialization is correct, consider handling cleanup to prevent state updates on unmounted component:

 useEffect(() => {
-  initializeUserData();
+  let mounted = true;
+  const initialize = async () => {
+    try {
+      await dispatch(getUserData());
+      if (mounted) {
+        setLoading(false);
+      }
+    } catch (error) {
+      if (mounted) {
+        setLoading(false);
+        console.error('Failed to initialize user data:', error);
+      }
+    }
+  };
+  initialize();
+  return () => {
+    mounted = false;
+  };
 }, []);
📜 Review details

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

📥 Commits

Reviewing files that changed from the base of the PR and between 2b6549d and 6db80f7.

📒 Files selected for processing (1)
  • packages/desktop-client/src/components/LoggedInUser.tsx (2 hunks)
🔇 Additional comments (2)
packages/desktop-client/src/components/LoggedInUser.tsx (2)

8-8: LGTM!

The import of the listen function is correctly placed and necessary for the new sync event functionality.


74-75: Null-safety properly implemented.

The code now correctly uses optional chaining for userData?.offline checks, addressing the null-safety concerns raised in the previous review.

packages/desktop-client/src/components/LoggedInUser.tsx Outdated Show resolved Hide resolved
packages/desktop-client/src/components/LoggedInUser.tsx Outdated Show resolved Hide resolved
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

♻️ Duplicate comments (2)
packages/desktop-client/src/components/LoggedInUser.tsx (2)

56-59: ⚠️ Potential issue

Add error handling for the async operation.

The async operation could fail, and currently, there's no error handling. This could lead to the loading state being stuck.

Apply this diff to add proper error handling:

 const initializeUserData = async () => {
+  try {
     await dispatch(getUserData());
     setLoading(false);
+  } catch (error) {
+    setLoading(false);
+    // Consider showing an error message to the user
+    console.error('Failed to initialize user data:', error);
+  }
 };

65-83: ⚠️ Potential issue

Improve sync event handling robustness.

  1. The null safety issue with userData access persists.
  2. The loading state management in the sync event handler could be improved.

Apply these improvements:

 useEffect(() => {
   return listen('sync-event', ({ type }) => {
     if (type === 'start') {
       setLoading(true);
       return;
     }

     const shouldReinitialize =
-      (type === 'success' && userData?.offline) ||
-      (type === 'error' && !userData?.offline);
+      userData &&
+      ((type === 'success' && userData.offline) ||
+       (type === 'error' && !userData.offline));

     if (shouldReinitialize) {
-      initializeUserData();
+      initializeUserData().catch(() => {
+        // Ensure loading state is reset even if initialization fails
+        setLoading(false);
+      });
     } else {
       setLoading(false);
     }
   });
 }, [userData]);

This change:

  1. Adds proper null check for userData
  2. Ensures loading state is reset even if initialization fails
🧹 Nitpick comments (1)
packages/desktop-client/src/components/LoggedInUser.tsx (1)

61-62: Add cleanup handling for component unmount.

The effect should handle cleanup to prevent setting state on an unmounted component.

 useEffect(() => {
-    initializeUserData();
+    let mounted = true;
+    initializeUserData().finally(() => {
+      if (mounted) {
+        setLoading(false);
+      }
+    });
+    return () => {
+      mounted = false;
+    };
 }, []);
📜 Review details

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

📥 Commits

Reviewing files that changed from the base of the PR and between 6db80f7 and b24a7e5.

📒 Files selected for processing (1)
  • packages/desktop-client/src/components/LoggedInUser.tsx (2 hunks)
🔇 Additional comments (1)
packages/desktop-client/src/components/LoggedInUser.tsx (1)

8-8: LGTM!

The import of the listen function is correctly placed and necessary for implementing the sync-event listener.

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

♻️ Duplicate comments (1)
packages/desktop-client/src/components/LoggedInUser.tsx (1)

78-80: ⚠️ Potential issue

Ensure null-safety for userData checks.

The conditional checks on userData?.offline could lead to runtime issues if userData is null.

 const shouldReinitialize =
-  (type === 'success' && userData?.offline) ||
-  (type === 'error' && !userData?.offline);
+  userData &&
+  ((type === 'success' && userData.offline) ||
+   (type === 'error' && !userData.offline));
🧹 Nitpick comments (1)
packages/desktop-client/src/components/LoggedInUser.tsx (1)

56-64: Consider adding user feedback for initialization errors.

While the error handling is good, users might benefit from visual feedback when initialization fails.

 const initializeUserData = async () => {
   try {
     await dispatch(getUserData());
   } catch (error) {
     console.error('Failed to initialize user data:', error);
+    // Consider showing a user-friendly error message
+    // Example: dispatch(showErrorNotification('Failed to connect to server. Please try again.'));
   } finally {
     setLoading(false);
   }
 };
📜 Review details

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

📥 Commits

Reviewing files that changed from the base of the PR and between b24a7e5 and b8743b3.

📒 Files selected for processing (1)
  • packages/desktop-client/src/components/LoggedInUser.tsx (2 hunks)
🔇 Additional comments (2)
packages/desktop-client/src/components/LoggedInUser.tsx (2)

8-8: LGTM: Import statement is correctly placed.

The new import of the listen function is necessary for implementing the sync event functionality.


66-67: LGTM: Initial data loading is properly implemented.

The useEffect hook correctly initializes user data on component mount.

@@ -52,14 +53,41 @@ export function LoggedInUser({
const currentFile = remoteFiles.find(f => f.cloudFileId === cloudFileId);
const hasSyncedPrefs = useSelector((state: State) => state.prefs.synced);

useEffect(() => {
async function init() {
const initializeUserData = async () => {
Copy link
Contributor

Choose a reason for hiding this comment

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

This should be defined inside the useEffect hook

Copy link
Author

Choose a reason for hiding this comment

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

There is now 2 different useEffect. The first one is calling initializeUserData after first rendering, and the second one is used to listen to sync-event and call initializeUserData when needed, and is dependant to userData.

Both are using the initializeUserData method, it is for this reason that initializeUserData is defined outside the useEffect hooks.

Can you explain in more detail how initializeUserData definition should be done?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Bug]: says "server offline" when it actually came back
2 participants