[PR #7526] [MERGED] Tracking budget api income #114046

Closed
opened 2026-06-05 21:26:23 -05:00 by GiteaMirror · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/actualbudget/actual/pull/7526
Author: @JSkinnerUK
Created: 4/16/2026
Status: Merged
Merged: 5/11/2026
Merged by: @matt-fidd

Base: masterHead: tracking-budget-api-income


📝 Commits (9)

  • d57621f Add tests and handling income group in different budget types
  • 93e7b5d Handle income groups in reflect budget logic
  • c35947d Add release note
  • fbb1141 Lint fix
  • e6b7690 Address coderabbit feedback
  • 7938a23 Remove ts-strict-ignore
  • cb84252 Change test dates, and assert group existence
  • 9290fb5 fix naming
  • 5a08518 fix typecheck

📊 Changes

5 files changed (+118 additions, -1 deletions)

View changed files

📝 packages/loot-core/src/server/api.test.ts (+89 -0)
📝 packages/loot-core/src/server/api.ts (+18 -0)
📝 packages/loot-core/src/types/api-handlers.ts (+3 -1)
📝 packages/loot-core/typings/window.ts (+2 -0)
upcoming-release-notes/7526.md (+6 -0)

📄 Description

Description

From investigating this issue, I concluded that it must be that the reporter was using a tracking budget, as the missing fields, budgeted and balance are not relevant to an envelope budget, so create a test and fixed on that assumption, so that these fields get returned from the api when this budget type is in use.

Fixes #3387

Testing

Added a new test for this.

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.96 MB 0%
loot-core 1 5.28 MB → 5.28 MB (+557 B) +0.01%
api 2 3.9 MB → 3.9 MB (+542 B) +0.01%
cli 1 7.97 MB 0%
crdt 1 43.41 kB 0%
View detailed bundle stats

desktop-client

Total

Files count Total bundle size % Changed
34 13.96 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
static/js/index.js 1.96 MB 0%
static/js/BackgroundImage.js 121.09 kB 0%
static/js/FormulaEditor.js 962.55 kB 0%
static/js/ReportRouter.js 1.22 MB 0%
static/js/ScheduleEditForm.js 146.45 kB 0%
static/js/TransactionEdit.js 190.4 kB 0%
static/js/TransactionList.js 85.81 kB 0%
static/js/Value.js 4.94 MB 0%
static/js/bankSyncUtils.js 54.15 kB 0%
static/js/ca.js 187.91 kB 0%
static/js/chart-theme.js 800.08 kB 0%
static/js/client.js 451.37 kB 0%
static/js/da.js 101.38 kB 0%
static/js/de.js 170.55 kB 0%
static/js/en-GB.js 8.2 kB 0%
static/js/en.js 185.11 kB 0%
static/js/es.js 179 kB 0%
static/js/extends.js 520.92 kB 0%
static/js/fr.js 178.9 kB 0%
static/js/indexeddb-main-thread-worker-e59fee74.js 13.46 kB 0%
static/js/it.js 165.3 kB 0%
static/js/narrow.js 363.89 kB 0%
static/js/nb-NO.js 148.31 kB 0%
static/js/nl.js 106.47 kB 0%
static/js/pl.js 86.52 kB 0%
static/js/pt-BR.js 189.58 kB 0%
static/js/resize-observer.js 18.06 kB 0%
static/js/th.js 174.76 kB 0%
static/js/theme.js 31.67 kB 0%
static/js/uk.js 207.75 kB 0%
static/js/useFormatList.js 4.96 kB 0%
static/js/wide.js 453 B 0%
static/js/workbox-window.prod.es5.js 7.33 kB 0%
static/js/zh-Hans.js 117.91 kB 0%

loot-core

Total

Files count Total bundle size % Changed
1 5.28 MB → 5.28 MB (+557 B) +0.01%
Changeset
File Δ Size
home/runner/work/actual/actual/packages/loot-core/src/server/api.ts 📈 +557 B (+2.37%) 22.92 kB → 23.46 kB
View detailed bundle breakdown

Added

Asset File Size % Changed
kcab.worker.CnsLtsAM.js 0 B → 5.28 MB (+5.28 MB) -

Removed

Asset File Size % Changed
kcab.worker.BgC9bktg.js 5.28 MB → 0 B (-5.28 MB) -100%

Bigger
No assets were bigger

Smaller
No assets were smaller

Unchanged
No assets were unchanged


api

Total

Files count Total bundle size % Changed
2 3.9 MB → 3.9 MB (+542 B) +0.01%
Changeset
File Δ Size
home/runner/work/actual/actual/packages/loot-core/src/server/api.ts 📈 +542 B (+2.37%) 22.31 kB → 22.84 kB
View detailed bundle breakdown

Added
No assets were added

Removed
No assets were removed

Bigger

Asset File Size % Changed
index.js 3.9 MB → 3.9 MB (+542 B) +0.01%

Smaller
No assets were smaller

Unchanged

Asset File Size % Changed
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 43.41 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 43.41 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/7526 **Author:** [@JSkinnerUK](https://github.com/JSkinnerUK) **Created:** 4/16/2026 **Status:** ✅ Merged **Merged:** 5/11/2026 **Merged by:** [@matt-fidd](https://github.com/matt-fidd) **Base:** `master` ← **Head:** `tracking-budget-api-income` --- ### 📝 Commits (9) - [`d57621f`](https://github.com/actualbudget/actual/commit/d57621fe7889ad3e6b319e5ee771814a3aef081b) Add tests and handling income group in different budget types - [`93e7b5d`](https://github.com/actualbudget/actual/commit/93e7b5db3c4b4e3a385346ca179415af704d2de6) Handle income groups in reflect budget logic - [`c35947d`](https://github.com/actualbudget/actual/commit/c35947d2d27ff833d9cc7e8a2702df7b5c4c27a9) Add release note - [`fbb1141`](https://github.com/actualbudget/actual/commit/fbb1141659351b203192ec04add2fc73e3beebb4) Lint fix - [`e6b7690`](https://github.com/actualbudget/actual/commit/e6b76909b5ef49634197ec894dcb26448aeef1bb) Address coderabbit feedback - [`7938a23`](https://github.com/actualbudget/actual/commit/7938a234b8c7a1ba17b3d6638056452667a6b398) Remove ts-strict-ignore - [`cb84252`](https://github.com/actualbudget/actual/commit/cb8425244f6e42f4356f38db70831d927d7044ae) Change test dates, and assert group existence - [`9290fb5`](https://github.com/actualbudget/actual/commit/9290fb5a673c91ca618b5a16fc5290ed5e37f3de) fix naming - [`5a08518`](https://github.com/actualbudget/actual/commit/5a085189f93bcb4ff8ab0457a99ebb71e2544442) fix typecheck ### 📊 Changes **5 files changed** (+118 additions, -1 deletions) <details> <summary>View changed files</summary> 📝 `packages/loot-core/src/server/api.test.ts` (+89 -0) 📝 `packages/loot-core/src/server/api.ts` (+18 -0) 📝 `packages/loot-core/src/types/api-handlers.ts` (+3 -1) 📝 `packages/loot-core/typings/window.ts` (+2 -0) ➕ `upcoming-release-notes/7526.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://github.com/actualbudget/docs#writing-good-release-notes. Try running yarn generate:release-notes *before* pushing your PR for an interactive experience. --> ## Description From investigating this issue, I concluded that it must be that the reporter was using a tracking budget, as the missing fields, budgeted and balance are not relevant to an envelope budget, so create a test and fixed on that assumption, so that these fields get returned from the api when this budget type is in use. <!-- 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?--> ## Related issue(s) Fixes #3387 <!-- e.g. Fixes #123, Relates to #456 --> ## Testing Added a new test for this. <!-- What did you test? How can we reproduce the issue you are fixing or how can we test the feature you built? --> ## 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.96 MB | 0% loot-core | 1 | 5.28 MB → 5.28 MB (+557 B) | +0.01% api | 2 | 3.9 MB → 3.9 MB (+542 B) | +0.01% cli | 1 | 7.97 MB | 0% crdt | 1 | 43.41 kB | 0% <details> <summary>View detailed bundle stats</summary> #### desktop-client **Total** Files count | Total bundle size | % Changed ----------- | ----------------- | --------- 34 | 13.96 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 ----- | --------- | --------- static/js/index.js | 1.96 MB | 0% static/js/BackgroundImage.js | 121.09 kB | 0% static/js/FormulaEditor.js | 962.55 kB | 0% static/js/ReportRouter.js | 1.22 MB | 0% static/js/ScheduleEditForm.js | 146.45 kB | 0% static/js/TransactionEdit.js | 190.4 kB | 0% static/js/TransactionList.js | 85.81 kB | 0% static/js/Value.js | 4.94 MB | 0% static/js/bankSyncUtils.js | 54.15 kB | 0% static/js/ca.js | 187.91 kB | 0% static/js/chart-theme.js | 800.08 kB | 0% static/js/client.js | 451.37 kB | 0% static/js/da.js | 101.38 kB | 0% static/js/de.js | 170.55 kB | 0% static/js/en-GB.js | 8.2 kB | 0% static/js/en.js | 185.11 kB | 0% static/js/es.js | 179 kB | 0% static/js/extends.js | 520.92 kB | 0% static/js/fr.js | 178.9 kB | 0% static/js/indexeddb-main-thread-worker-e59fee74.js | 13.46 kB | 0% static/js/it.js | 165.3 kB | 0% static/js/narrow.js | 363.89 kB | 0% static/js/nb-NO.js | 148.31 kB | 0% static/js/nl.js | 106.47 kB | 0% static/js/pl.js | 86.52 kB | 0% static/js/pt-BR.js | 189.58 kB | 0% static/js/resize-observer.js | 18.06 kB | 0% static/js/th.js | 174.76 kB | 0% static/js/theme.js | 31.67 kB | 0% static/js/uk.js | 207.75 kB | 0% static/js/useFormatList.js | 4.96 kB | 0% static/js/wide.js | 453 B | 0% static/js/workbox-window.prod.es5.js | 7.33 kB | 0% static/js/zh-Hans.js | 117.91 kB | 0% </div> </details> --- #### loot-core **Total** Files count | Total bundle size | % Changed ----------- | ----------------- | --------- 1 | 5.28 MB → 5.28 MB (+557 B) | +0.01% <details> <summary>Changeset</summary> File | Δ | Size ---- | - | ---- `home/runner/work/actual/actual/packages/loot-core/src/server/api.ts` | 📈 +557 B (+2.37%) | 22.92 kB → 23.46 kB </details> <details> <summary>View detailed bundle breakdown</summary> <div> **Added** Asset | File Size | % Changed ----- | --------- | --------- kcab.worker.CnsLtsAM.js | 0 B → 5.28 MB (+5.28 MB) | - **Removed** Asset | File Size | % Changed ----- | --------- | --------- kcab.worker.BgC9bktg.js | 5.28 MB → 0 B (-5.28 MB) | -100% **Bigger** No assets were bigger **Smaller** No assets were smaller **Unchanged** No assets were unchanged </div> </details> --- #### api **Total** Files count | Total bundle size | % Changed ----------- | ----------------- | --------- 2 | 3.9 MB → 3.9 MB (+542 B) | +0.01% <details> <summary>Changeset</summary> File | Δ | Size ---- | - | ---- `home/runner/work/actual/actual/packages/loot-core/src/server/api.ts` | 📈 +542 B (+2.37%) | 22.31 kB → 22.84 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 ----- | --------- | --------- index.js | 3.9 MB → 3.9 MB (+542 B) | +0.01% **Smaller** No assets were smaller **Unchanged** Asset | File Size | % Changed ----- | --------- | --------- 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 | 43.41 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 | 43.41 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 21:26:23 -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#114046