[PR #8043] [AI] Fix monthly spending category group budgets #114340

Open
opened 2026-06-05 22:10:13 -05:00 by GiteaMirror · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/actualbudget/actual/pull/8043
Author: @sys044
Created: 6/2/2026
Status: 🔄 Open

Base: master ← Head: pr-7877-reopen


📝 Commits (4)

  • f27d883 [AI] Fix monthly spending category group budgets
  • b05511c chore: added release notes
  • 06d6295 [AI] Add tests for spending budget category group filters
  • f64279a [AI] Prevent budget undercounting when spending report conditions are unsupported

📊 Changes

4 files changed (+167 additions, -44 deletions)

View changed files

📝 packages/desktop-client/src/components/reports/spreadsheets/budgetDataQuery.ts (+30 -29)
➕ packages/desktop-client/src/components/reports/spreadsheets/spending-spreadsheet.test.ts (+73 -0)
📝 packages/desktop-client/src/components/reports/spreadsheets/spending-spreadsheet.ts (+58 -15)
➕ upcoming-release-notes/8043.md (+6 -0)

📄 Description

Description

Re-opening #7877

Fixes issue where, when applying a category group filter, the Monthly Spending budgeted line didn't match the actual budgeted amounts.

It reuses the existing category condition helper.

This is a copy of the code committed by the original contributor, I've manually tested the changes.

Related issue(s)

Fixes https://github.com/actualbudget/actual/issues/7627

Testing

Budget configuration:
image

Now correctly uses group budget total:
image

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 37 14.04 MB → 14.04 MB (+694 B) +0.00%
loot-core 1 5.28 MB 0%
api 2 3.86 MB 0%
cli 1 7.97 MB 0%
crdt 1 11.12 kB 0%
View detailed bundle stats

desktop-client

Total

Files count Total bundle size % Changed
37 14.04 MB → 14.04 MB (+694 B) +0.00%
Changeset
File Δ Size
src/components/reports/spreadsheets/spending-spreadsheet.ts 📈 +597 B (+10.48%) 5.56 kB → 6.14 kB
src/components/reports/spreadsheets/budgetDataQuery.ts 📈 +97 B (+2.17%) 4.37 kB → 4.46 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.26 MB → 1.26 MB (+694 B) +0.05%

Smaller
No assets were smaller

Unchanged

Asset File Size % Changed
static/js/index.js 1.55 MB 0%
static/js/BackgroundImage.js 121.09 kB 0%
static/js/FormulaEditor.js 962.55 kB 0%
static/js/ManageRules.js 46.64 kB 0%
static/js/PayeeRuleCountLabel.js 7.33 kB 0%
static/js/ScheduleEditForm.js 146.44 kB 0%
static/js/SchedulesTable.js 202.7 kB 0%
static/js/TransactionEdit.js 90.63 kB 0%
static/js/TransactionList.js 85.81 kB 0%
static/js/Value.js 5.09 MB 0%
static/js/_baseIsEqual.js 98.38 kB 0%
static/js/ca.js 186.63 kB 0%
static/js/client.js 451.37 kB 0%
static/js/da.js 101.02 kB 0%
static/js/de.js 170.87 kB 0%
static/js/en-GB.js 9.25 kB 0%
static/js/en.js 199.23 kB 0%
static/js/es.js 178.57 kB 0%
static/js/extends.js 501.42 kB 0%
static/js/fr.js 178.44 kB 0%
static/js/indexeddb-main-thread-worker-e59fee74.js 13.46 kB 0%
static/js/it.js 164.87 kB 0%
static/js/narrow.js 364.5 kB 0%
static/js/nb-NO.js 147.94 kB 0%
static/js/nl.js 107 kB 0%
static/js/pt-BR.js 188.32 kB 0%
static/js/resize-observer.js 18.06 kB 0%
static/js/th.js 174.31 kB 0%
static/js/theme.js 31.88 kB 0%
static/js/toString.js 705.14 kB 0%
static/js/uk.js 207.3 kB 0%
static/js/useFormatList.js 2.52 kB 0%
static/js/useTransactionBatchActions.js 9.71 kB 0%
static/js/wide.js 299.14 kB 0%
static/js/workbox-window.prod.es5.js 7.33 kB 0%
static/js/zh-Hans.js 117.01 kB 0%

loot-core

Total

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

api

Total

Files count Total bundle size % Changed
2 3.86 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.86 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 11.12 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 11.12 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/8043 **Author:** [@sys044](https://github.com/sys044) **Created:** 6/2/2026 **Status:** 🔄 Open **Base:** `master` ← **Head:** `pr-7877-reopen` --- ### 📝 Commits (4) - [`f27d883`](https://github.com/actualbudget/actual/commit/f27d883c83670069388bb66d964f3482e83d46aa) [AI] Fix monthly spending category group budgets - [`b05511c`](https://github.com/actualbudget/actual/commit/b05511cbe2b02f6e8c22c89a34c2339f9308f34b) chore: added release notes - [`06d6295`](https://github.com/actualbudget/actual/commit/06d629550bbdc9b257312195c49dee6591e220bd) [AI] Add tests for spending budget category group filters - [`f64279a`](https://github.com/actualbudget/actual/commit/f64279a63601981d5850c7b8453047812deef39d) [AI] Prevent budget undercounting when spending report conditions are unsupported ### 📊 Changes **4 files changed** (+167 additions, -44 deletions) <details> <summary>View changed files</summary> 📝 `packages/desktop-client/src/components/reports/spreadsheets/budgetDataQuery.ts` (+30 -29) ➕ `packages/desktop-client/src/components/reports/spreadsheets/spending-spreadsheet.test.ts` (+73 -0) 📝 `packages/desktop-client/src/components/reports/spreadsheets/spending-spreadsheet.ts` (+58 -15) ➕ `upcoming-release-notes/8043.md` (+6 -0) </details> ### 📄 Description <!-- Thank you for submitting a pull request! Make sure to follow the instructions to write release notes for your PR — it should only take a minute or two: https://actualbudget.org/docs/contributing/#writing-good-release-notes. Try running yarn generate:release-notes *before* pushing your PR for an interactive experience. --> ## Description <!-- What does this PR do? Why is it needed? Please give context on the "why?": why do we need this change? What problem is it solving for you?--> Re-opening #7877 Fixes issue where, when applying a category group filter, the Monthly Spending budgeted line didn't match the actual budgeted amounts. It reuses the existing category condition helper. This is a copy of the code committed by the original contributor, I've manually tested the changes. ## Related issue(s) Fixes https://github.com/actualbudget/actual/issues/7627 ## Testing Budget configuration: <img width="800" height="633" alt="image" src="https://github.com/user-attachments/assets/004c168a-e347-46db-b6c5-229c023d8d23" /> Now correctly uses group budget total: <img width="1655" height="913" alt="image" src="https://github.com/user-attachments/assets/b580fe35-72d6-418c-82c1-14cb6f45f45c" /> ## 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 | 37 | 14.04 MB → 14.04 MB (+694 B) | +0.00% loot-core | 1 | 5.28 MB | 0% api | 2 | 3.86 MB | 0% cli | 1 | 7.97 MB | 0% crdt | 1 | 11.12 kB | 0% <details> <summary>View detailed bundle stats</summary> #### desktop-client **Total** Files count | Total bundle size | % Changed ----------- | ----------------- | --------- 37 | 14.04 MB → 14.04 MB (+694 B) | +0.00% <details> <summary>Changeset</summary> File | Δ | Size ---- | - | ---- `src/components/reports/spreadsheets/spending-spreadsheet.ts` | 📈 +597 B (+10.48%) | 5.56 kB → 6.14 kB `src/components/reports/spreadsheets/budgetDataQuery.ts` | 📈 +97 B (+2.17%) | 4.37 kB → 4.46 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.26 MB → 1.26 MB (+694 B) | +0.05% **Smaller** No assets were smaller **Unchanged** Asset | File Size | % Changed ----- | --------- | --------- static/js/index.js | 1.55 MB | 0% static/js/BackgroundImage.js | 121.09 kB | 0% static/js/FormulaEditor.js | 962.55 kB | 0% static/js/ManageRules.js | 46.64 kB | 0% static/js/PayeeRuleCountLabel.js | 7.33 kB | 0% static/js/ScheduleEditForm.js | 146.44 kB | 0% static/js/SchedulesTable.js | 202.7 kB | 0% static/js/TransactionEdit.js | 90.63 kB | 0% static/js/TransactionList.js | 85.81 kB | 0% static/js/Value.js | 5.09 MB | 0% static/js/_baseIsEqual.js | 98.38 kB | 0% static/js/ca.js | 186.63 kB | 0% static/js/client.js | 451.37 kB | 0% static/js/da.js | 101.02 kB | 0% static/js/de.js | 170.87 kB | 0% static/js/en-GB.js | 9.25 kB | 0% static/js/en.js | 199.23 kB | 0% static/js/es.js | 178.57 kB | 0% static/js/extends.js | 501.42 kB | 0% static/js/fr.js | 178.44 kB | 0% static/js/indexeddb-main-thread-worker-e59fee74.js | 13.46 kB | 0% static/js/it.js | 164.87 kB | 0% static/js/narrow.js | 364.5 kB | 0% static/js/nb-NO.js | 147.94 kB | 0% static/js/nl.js | 107 kB | 0% static/js/pt-BR.js | 188.32 kB | 0% static/js/resize-observer.js | 18.06 kB | 0% static/js/th.js | 174.31 kB | 0% static/js/theme.js | 31.88 kB | 0% static/js/toString.js | 705.14 kB | 0% static/js/uk.js | 207.3 kB | 0% static/js/useFormatList.js | 2.52 kB | 0% static/js/useTransactionBatchActions.js | 9.71 kB | 0% static/js/wide.js | 299.14 kB | 0% static/js/workbox-window.prod.es5.js | 7.33 kB | 0% static/js/zh-Hans.js | 117.01 kB | 0% </div> </details> --- #### loot-core **Total** Files count | Total bundle size | % Changed ----------- | ----------------- | --------- 1 | 5.28 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.DqXuTWaP.js | 5.28 MB | 0% </div> </details> --- #### api **Total** Files count | Total bundle size | % Changed ----------- | ----------------- | --------- 2 | 3.86 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.86 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 | 11.12 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 | 11.12 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-06-05 22:10:13 -05:00
Sign in to join this conversation.
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/actual#114340