github-starred/actual
2
0
Fork 0
mirror of https://github.com/actualbudget/actual.git synced 2026-05-06 07:01:45 -05:00
Code Issues 1.5k Packages Projects Releases 54 Wiki Activity

[PR #7629] [WIP] [AI] Fix category group filtering for budgeted custom reports #56603

New Issue
Open
opened 2026-05-01 04:34:47 -05:00 by GiteaMirror · 0 comments
GiteaMirror commented 2026-05-01 04:34:47 -05:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/actualbudget/actual/pull/7629
Author: @Kelpy2004
Created: 4/26/2026
Status: 🔄 Open

Base: master ← Head: fix-custom-report-category-group-filter

📝 Commits (2)

  • 1b42a2e [AI] Fix category group filtering for budgeted custom reports
  • d24cd7d [AI] Add release notes for budgeted report filter fix

📊 Changes

3 files changed (+178 additions, -9 deletions)

View changed files

➕ packages/desktop-client/src/components/reports/spreadsheets/budgetDataQuery.test.ts (+102 -0)
📝 packages/desktop-client/src/components/reports/spreadsheets/budgetDataQuery.ts (+70 -9)
➕ upcoming-release-notes/7629.md (+6 -0)

📄 Description

Description

This fixes Category Group filtering for Budgeted custom reports.
The Budgeted custom report path uses fetchBudgetData, which previously only interpreted category filter conditions. Because category_group conditions were ignored, filters like Category Group = X or Category Group one of {X,Y,Z} did not affect the report results.
This PR extends the budgeted report filtering logic to evaluate category_group conditions against each category’s group.

Related issue(s)

Fixes #7550

Testing

Tested with:

  • corepack yarn workspace @actual-app/web test src/components/reports/spreadsheets/budgetDataQuery.test.ts
  • corepack yarn workspace @actual-app/web typecheck
  • corepack yarn oxfmt --check packages/desktop-client/src/components/reports/spreadsheets/budgetDataQuery.ts packages/desktop-client/src/components/reports/spreadsheets/budgetDataQuery.test.ts
  • git diff --check

Added focused unit tests for Category Group is, oneOf, combined Category + Category Group filters, and text matching against category group names.

Checklist

  • Release notes added (see link above)
  • No obvious regressions in affected areas
  • Self-review has been performed - I understand what each change in the code does and why it is needed

Bundle Stats

Bundle Files count Total bundle size % Changed
desktop-client 34 13.88 MB → 13.89 MB (+1.36 kB) +0.01%
loot-core 1 5.27 MB 0%
api 2 3.89 MB 0%
cli 1 7.97 MB 0%
crdt 1 41.83 kB 0%
View detailed bundle stats

desktop-client

Total

Files count Total bundle size % Changed
34 13.88 MB → 13.89 MB (+1.36 kB) +0.01%
Changeset
File Δ Size
src/components/reports/spreadsheets/budgetDataQuery.ts 📈 +985 B (+28.24%) 3.41 kB → 4.37 kB
locale/es.json 📈 +399 B (+0.21%) 181.86 kB → 182.25 kB
locale/zh-Hans.json 📈 +11 B (+0.01%) 119.73 kB → 119.74 kB
View detailed bundle breakdown

Added
No assets were added

Removed
No assets were removed

Bigger

Asset File Size % Changed
static/js/ReportRouter.js 1.22 MB → 1.22 MB (+985 B) +0.08%
static/js/es.js 181.86 kB → 182.25 kB (+399 B) +0.21%
static/js/zh-Hans.js 119.73 kB → 119.74 kB (+11 B) +0.01%

Smaller
No assets were smaller

Unchanged

Asset File Size % Changed
static/js/index.js 1.87 MB 0%
static/js/BackgroundImage.js 121.09 kB 0%
static/js/FormulaEditor.js 962.55 kB 0%
static/js/PayeeRuleCountLabel.js 52.52 kB 0%
static/js/ScheduleEditForm.js 145.68 kB 0%
static/js/TransactionEdit.js 186.56 kB 0%
static/js/TransactionList.js 85.81 kB 0%
static/js/Value.js 4.94 MB 0%
static/js/ca.js 191.46 kB 0%
static/js/chart-theme.js 796.5 kB 0%
static/js/client.js 451.37 kB 0%
static/js/da.js 104.22 kB 0%
static/js/de.js 173.88 kB 0%
static/js/en-GB.js 8.2 kB 0%
static/js/en.js 176.89 kB 0%
static/js/extends.js 518.66 kB 0%
static/js/fr.js 182.5 kB 0%
static/js/indexeddb-main-thread-worker-e59fee74.js 13.46 kB 0%
static/js/it.js 168.33 kB 0%
static/js/narrow.js 364.31 kB 0%
static/js/nb-NO.js 151.39 kB 0%
static/js/nl.js 108.46 kB 0%
static/js/pl.js 88.14 kB 0%
static/js/pt-BR.js 193.24 kB 0%
static/js/resize-observer.js 18.06 kB 0%
static/js/th.js 178.63 kB 0%
static/js/theme.js 31.67 kB 0%
static/js/uk.js 212.03 kB 0%
static/js/useFormatList.js 8.63 kB 0%
static/js/wide.js 453 B 0%
static/js/workbox-window.prod.es5.js 7.33 kB 0%

loot-core

Total

Files count Total bundle size % Changed
1 5.27 MB 0%
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.tCyo0gRC.js 5.27 MB 0%

api

Total

Files count Total bundle size % Changed
2 3.89 MB 0%
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
index.js 3.89 MB 0%
models.js 0 B 0%

cli

Total

Files count Total bundle size % Changed
1 7.97 MB 0%
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
cli.js 7.97 MB 0%

crdt

Total

Files count Total bundle size % Changed
1 41.83 kB 0%
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
index.js 41.83 kB 0%

🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/actualbudget/actual/pull/7629 **Author:** [@Kelpy2004](https://github.com/Kelpy2004) **Created:** 4/26/2026 **Status:** 🔄 Open **Base:** `master` ← **Head:** `fix-custom-report-category-group-filter` --- ### 📝 Commits (2) - [`1b42a2e`](https://github.com/actualbudget/actual/commit/1b42a2e5b387eddb8212b88da70abe7e4c3f2956) [AI] Fix category group filtering for budgeted custom reports - [`d24cd7d`](https://github.com/actualbudget/actual/commit/d24cd7d4b946e5345a03c88a21973bb9b19c1d0e) [AI] Add release notes for budgeted report filter fix ### 📊 Changes **3 files changed** (+178 additions, -9 deletions) <details> <summary>View changed files</summary> ➕ `packages/desktop-client/src/components/reports/spreadsheets/budgetDataQuery.test.ts` (+102 -0) 📝 `packages/desktop-client/src/components/reports/spreadsheets/budgetDataQuery.ts` (+70 -9) ➕ `upcoming-release-notes/7629.md` (+6 -0) </details> ### 📄 Description ## Description This fixes Category Group filtering for Budgeted custom reports. The Budgeted custom report path uses `fetchBudgetData`, which previously only interpreted `category` filter conditions. Because `category_group` conditions were ignored, filters like `Category Group = X` or `Category Group one of {X,Y,Z}` did not affect the report results. This PR extends the budgeted report filtering logic to evaluate `category_group` conditions against each category’s group. ## Related issue(s) Fixes #7550 ## Testing Tested with: - `corepack yarn workspace @actual-app/web test src/components/reports/spreadsheets/budgetDataQuery.test.ts` - `corepack yarn workspace @actual-app/web typecheck` - `corepack yarn oxfmt --check packages/desktop-client/src/components/reports/spreadsheets/budgetDataQuery.ts packages/desktop-client/src/components/reports/spreadsheets/budgetDataQuery.test.ts` - `git diff --check` Added focused unit tests for Category Group `is`, `oneOf`, combined Category + Category Group filters, and text matching against category group names. ## Checklist - [x] Release notes added (see link above) - [x] No obvious regressions in affected areas - [x] Self-review has been performed - I understand what each change in the code does and why it is needed <!--- actual-bot-sections ---> <!--- bundlestats-action-comment key:combined start ---> ### Bundle Stats Bundle | Files count | Total bundle size | % Changed ------ | ----------- | ----------------- | --------- desktop-client | 34 | 13.88 MB → 13.89 MB (+1.36 kB) | +0.01% loot-core | 1 | 5.27 MB | 0% api | 2 | 3.89 MB | 0% cli | 1 | 7.97 MB | 0% crdt | 1 | 41.83 kB | 0% <details> <summary>View detailed bundle stats</summary> #### desktop-client **Total** Files count | Total bundle size | % Changed ----------- | ----------------- | --------- 34 | 13.88 MB → 13.89 MB (+1.36 kB) | +0.01% <details> <summary>Changeset</summary> File | Δ | Size ---- | - | ---- `src/components/reports/spreadsheets/budgetDataQuery.ts` | 📈 +985 B (+28.24%) | 3.41 kB → 4.37 kB `locale/es.json` | 📈 +399 B (+0.21%) | 181.86 kB → 182.25 kB `locale/zh-Hans.json` | 📈 +11 B (+0.01%) | 119.73 kB → 119.74 kB </details> <details> <summary>View detailed bundle breakdown</summary> <div> **Added** No assets were added **Removed** No assets were removed **Bigger** Asset | File Size | % Changed ----- | --------- | --------- static/js/ReportRouter.js | 1.22 MB → 1.22 MB (+985 B) | +0.08% static/js/es.js | 181.86 kB → 182.25 kB (+399 B) | +0.21% static/js/zh-Hans.js | 119.73 kB → 119.74 kB (+11 B) | +0.01% **Smaller** No assets were smaller **Unchanged** Asset | File Size | % Changed ----- | --------- | --------- static/js/index.js | 1.87 MB | 0% static/js/BackgroundImage.js | 121.09 kB | 0% static/js/FormulaEditor.js | 962.55 kB | 0% static/js/PayeeRuleCountLabel.js | 52.52 kB | 0% static/js/ScheduleEditForm.js | 145.68 kB | 0% static/js/TransactionEdit.js | 186.56 kB | 0% static/js/TransactionList.js | 85.81 kB | 0% static/js/Value.js | 4.94 MB | 0% static/js/ca.js | 191.46 kB | 0% static/js/chart-theme.js | 796.5 kB | 0% static/js/client.js | 451.37 kB | 0% static/js/da.js | 104.22 kB | 0% static/js/de.js | 173.88 kB | 0% static/js/en-GB.js | 8.2 kB | 0% static/js/en.js | 176.89 kB | 0% static/js/extends.js | 518.66 kB | 0% static/js/fr.js | 182.5 kB | 0% static/js/indexeddb-main-thread-worker-e59fee74.js | 13.46 kB | 0% static/js/it.js | 168.33 kB | 0% static/js/narrow.js | 364.31 kB | 0% static/js/nb-NO.js | 151.39 kB | 0% static/js/nl.js | 108.46 kB | 0% static/js/pl.js | 88.14 kB | 0% static/js/pt-BR.js | 193.24 kB | 0% static/js/resize-observer.js | 18.06 kB | 0% static/js/th.js | 178.63 kB | 0% static/js/theme.js | 31.67 kB | 0% static/js/uk.js | 212.03 kB | 0% static/js/useFormatList.js | 8.63 kB | 0% static/js/wide.js | 453 B | 0% static/js/workbox-window.prod.es5.js | 7.33 kB | 0% </div> </details> --- #### loot-core **Total** Files count | Total bundle size | % Changed ----------- | ----------------- | --------- 1 | 5.27 MB | 0% <details> <summary>View detailed bundle breakdown</summary> <div> **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.tCyo0gRC.js | 5.27 MB | 0% </div> </details> --- #### api **Total** Files count | Total bundle size | % Changed ----------- | ----------------- | --------- 2 | 3.89 MB | 0% <details> <summary>View detailed bundle breakdown</summary> <div> **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 ----- | --------- | --------- index.js | 3.89 MB | 0% models.js | 0 B | 0% </div> </details> --- #### cli **Total** Files count | Total bundle size | % Changed ----------- | ----------------- | --------- 1 | 7.97 MB | 0% <details> <summary>View detailed bundle breakdown</summary> <div> **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 ----- | --------- | --------- cli.js | 7.97 MB | 0% </div> </details> --- #### crdt **Total** Files count | Total bundle size | % Changed ----------- | ----------------- | --------- 1 | 41.83 kB | 0% <details> <summary>View detailed bundle breakdown</summary> <div> **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 ----- | --------- | --------- index.js | 41.83 kB | 0% </div> </details> </details> <!--- bundlestats-action-comment key:combined end ---> --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
GiteaMirror added the pull-request label 2026-05-01 04:34:47 -05:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
AI generated
API
bank sync
budgeting
bug
can’t replicate
dependencies
docker
documentation
electron
experimental feature
feature
feedback
goal templates
good first issue
help wanted
importers
maintenance
needs info
needs testing
needs triage
needs votes
openid
payees
pull-request
Mirrored from GitHub Pull Request
 regression
reports
responsive
rules
schedules
server
✨ merged
split transactions
tech debt
theme
transaction import
transaction reconciliation
transactions
translations
upstream
user interface
✅ approved
wontfix
No Label pull-request
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
GiteaMirror ninjasurge
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/actual#56603
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?