fix: apply filters in Reports dashboard for cash flow widget #4683

tostasmistas · 2025-03-23T23:59:40Z

This PR fixes #4663 and fixes #3915.

It fixes an issue where filters set in the widget editor for the cash flow widget were not applied in the Reports dashboard.

Before

After

netlify · 2025-03-24T00:01:08Z

✅ Deploy Preview for actualbudget ready!

Name	Link
🔨 Latest commit	`4eb3367`
🔍 Latest deploy log	https://app.netlify.com/sites/actualbudget/deploys/67e0a21874cb5d0008571f28
😎 Deploy Preview	https://deploy-preview-4683.demo.actualbudget.org
📱 Preview on mobile	Toggle QR Code... Use your smartphone camera to open QR code link.

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

github-actions · 2025-03-24T00:01:16Z

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
18	8.49 MB → 8.49 MB (+526 B)	+0.01%

Changeset

File	Δ	Size
`node_modules/function-bind/index.js`	📈 +189 B (+180.00%)	105 B → 294 B
`node_modules/function-bind/implementation.js`	📈 +265 B (+12.98%)	1.99 kB → 2.25 kB
`node_modules/hasown/index.js`	📈 +9 B (+5.06%)	178 B → 187 B
`node_modules/call-bind-apply-helpers/applyBind.js`	📈 +9 B (+4.09%)	220 B → 229 B
`node_modules/call-bind-apply-helpers/actualApply.js`	📈 +9 B (+3.63%)	248 B → 257 B
`node_modules/call-bind-apply-helpers/index.js`	📈 +9 B (+2.44%)	369 B → 378 B
`node_modules/object-keys/index.js`	📈 +2 B (+0.25%)	794 B → 796 B
`src/components/reports/spreadsheets/cash-flow-spreadsheet.tsx`	📈 +17 B (+0.24%)	6.92 kB → 6.93 kB
`node_modules/object-keys/implementation.js`	📈 +8 B (+0.23%)	3.43 kB → 3.44 kB
`node_modules/get-intrinsic/index.js`	📈 +9 B (+0.06%)	13.63 kB → 13.64 kB

View detailed bundle breakdown

Added

No assets were added

Removed

No assets were removed

Bigger

Asset	File Size	% Changed
static/js/index.js	5.5 MB → 5.5 MB (+509 B)	+0.01%
static/js/ReportRouter.js	1.59 MB → 1.59 MB (+17 B)	+0.00%

Smaller

No assets were smaller

Unchanged

Asset	File Size	% Changed
static/js/en-GB.js	5.37 kB	0%
static/js/es.js	65.71 kB	0%
static/js/de.js	121.27 kB	0%
static/js/nl.js	102.79 kB	0%
static/js/workbox-window.prod.es5.js	5.69 kB	0%
static/js/indexeddb-main-thread-worker-e59fee74.js	13.5 kB	0%
static/js/en.js	110.12 kB	0%
static/js/pt-BR.js	120.98 kB	0%
static/js/useAccountPreviewTransactions.js	1.69 kB	0%
static/js/AppliedFilters.js	10.87 kB	0%
static/js/BackgroundImage.js	122.29 kB	0%
static/js/uk.js	110.41 kB	0%
static/js/resize-observer.js	18.37 kB	0%
static/js/wide.js	112.23 kB	0%
static/js/fr.js	123.58 kB	0%
static/js/narrow.js	383.19 kB	0%

github-actions · 2025-03-24T00:01:17Z

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	2.28 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	2.28 MB	0%

fix issue where filters set in the widget editor for the cash flow widget were not applied in the Reports dashboard

coderabbitai · 2025-03-24T00:19:36Z

Walkthrough

The changes modify the query logic in the cash flow spreadsheet component by adding an extra filter in the makeQuery function within the simpleCashFlow function. This additional filter applies an $and condition that ensures the date field is greater than or equal to a specified start value. The existing filtering logic remains intact, with the new condition being appended to enforce a stricter date constraint on the queried transactions.

Assessment against linked issues

Objective	Addressed	Explanation
Fix account filtering in the Cash Flow widget's reports preview (#4663)	❓	The changes add a date range filter but do not explicitly address the account filtering logic as described.

Possibly related PRs

Fix issue with Monthly Spending report not properly averaging previous three months #3723: Refines date filtering in the createSpendingSpreadsheet function, similar in approach to the date comparisons updated in this PR.

Suggested labels

:sparkles: Merged

Suggested reviewers

carkom
youngcw

📜 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 b2287cd and 4eb3367.

⛔ Files ignored due to path filters (1)

upcoming-release-notes/4683.md is excluded by !**/*.md

📒 Files selected for processing (1)

packages/desktop-client/src/components/reports/spreadsheets/cash-flow-spreadsheet.tsx (1 hunks)

🔇 Additional comments (1)

packages/desktop-client/src/components/reports/spreadsheets/cash-flow-spreadsheet.tsx (1)

34-52: Good fix! Proper filter application will now ensure date ranges work correctly.

The changes correctly separate the filters into two distinct .filter() calls. This ensures that both the user-specified conditions AND the date range conditions are applied independently and correctly.

Previously, having both filters in a single object may have caused conflicts in how the conditions were evaluated, particularly with the conditionsOp parameter. By separating them:

The first filter applies user-defined conditions with the appropriate operation (AND/OR)

The second filter enforces date ranges and account constraints independently

This directly addresses the PR objective of applying filters correctly in the Reports dashboard for the cash flow widget.

✨ Finishing Touches

📝 Generate Docstrings

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ 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.
@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.

matt-fidd

Thanks for this!

…udget#4683) fix issue where filters set in the widget editor for the cash flow widget were not applied in the Reports dashboard

actual-github-bot bot added the 🚧 WIP label Mar 23, 2025

tostasmistas force-pushed the fix/cash-flow-widget-filters branch from a04ff3a to 3f4d884 Compare March 24, 2025 00:04

fix: apply filters in Reports dashboard for cash flow widget

4eb3367

fix issue where filters set in the widget editor for the cash flow widget were not applied in the Reports dashboard

tostasmistas changed the title ~~fix: apply filters in dashboard for cash flow widget~~ fix: apply filters in Reports dashboard for cash flow widget Mar 24, 2025

tostasmistas force-pushed the fix/cash-flow-widget-filters branch from 3f4d884 to 4eb3367 Compare March 24, 2025 00:06

tostasmistas marked this pull request as ready for review March 24, 2025 00:15

actual-github-bot bot added 🔍 Ready for review and removed 🚧 WIP labels Mar 24, 2025

matt-fidd approved these changes Mar 26, 2025

View reviewed changes

actual-github-bot bot added ✅ Approved and removed 🔍 Ready for review labels Mar 26, 2025

matt-fidd merged commit 0f8a1ae into actualbudget:master Mar 26, 2025
21 checks passed

actual-github-bot bot added ✨ Merged and removed ✅ Approved labels Mar 26, 2025

matt-fidd added this to the v25.4.0 milestone Mar 26, 2025

tostasmistas deleted the fix/cash-flow-widget-filters branch March 26, 2025 08:41

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: apply filters in Reports dashboard for cash flow widget #4683

fix: apply filters in Reports dashboard for cash flow widget #4683

tostasmistas commented Mar 23, 2025 •

edited

Loading

netlify bot commented Mar 24, 2025 •

edited

Loading

github-actions bot commented Mar 24, 2025 •

edited

Loading

github-actions bot commented Mar 24, 2025 •

edited

Loading

coderabbitai bot commented Mar 24, 2025

Chat

CodeRabbit Commands (Invoked using PR comments)

Other keywords and placeholders

CodeRabbit Configuration File (`.coderabbit.yaml`)

Documentation and Community

matt-fidd left a comment

fix: apply filters in Reports dashboard for cash flow widget #4683

fix: apply filters in Reports dashboard for cash flow widget #4683

Conversation

tostasmistas commented Mar 23, 2025 • edited Loading

netlify bot commented Mar 24, 2025 • edited Loading

✅ Deploy Preview for actualbudget ready!

github-actions bot commented Mar 24, 2025 • edited Loading

Bundle Stats — desktop-client

github-actions bot commented Mar 24, 2025 • edited Loading

Bundle Stats — loot-core

coderabbitai bot commented Mar 24, 2025

Walkthrough

Assessment against linked issues

Possibly related PRs

Suggested labels

Suggested reviewers

Chat

CodeRabbit Commands (Invoked using PR comments)

Other keywords and placeholders

CodeRabbit Configuration File (.coderabbit.yaml)

Documentation and Community

matt-fidd left a comment

Choose a reason for hiding this comment

tostasmistas commented Mar 23, 2025 •

edited

Loading

netlify bot commented Mar 24, 2025 •

edited

Loading

github-actions bot commented Mar 24, 2025 •

edited

Loading

github-actions bot commented Mar 24, 2025 •

edited

Loading

CodeRabbit Configuration File (`.coderabbit.yaml`)