github-starred/actual
2
0
Fork 0
mirror of https://github.com/actualbudget/actual.git synced 2026-03-09 03:32:54 -05:00
Code Issues 250 Packages Projects Releases 53 Wiki Activity

[PR #3178] [MERGED] ♻️ (reports) unify selectedCategories and conditions #4724

New Issue
Closed
opened 2026-02-28 21:00:17 -06:00 by GiteaMirror · 0 comments
GiteaMirror commented 2026-02-28 21:00:17 -06:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/actualbudget/actual/pull/3178
Author: @MatissJanis
Created: 8/2/2024
Status: ✅ Merged
Merged: 8/4/2024
Merged by: @MatissJanis

Base: master ← Head: matiss/reports-selectedCategories

📝 Commits (10+)

  • 2d4059b ♻️ (typescript) make category and rule types stricter
  • 3289ce8 ♻️ (reports) unify selectedCategories and conditions
  • e1e32cc Release notes
  • bc194db Typechecker & linter
  • 2041686 Merge branch 'master' into matiss/reports-selectedCategories
  • c0f4d7d Remove selectedCategories usage from queries and DB
  • 1e7d9a5 Category selector info message
  • ca93a98 Merge branch 'master' into matiss/reports-selectedCategories
  • dcec5ad Migration
  • f9ef7f1 Feedback: update message

📊 Changes

17 files changed (+200 additions, -101 deletions)

View changed files

📝 packages/desktop-client/src/components/reports/ReportSidebar.tsx (+24 -13)
📝 packages/desktop-client/src/components/reports/reports/CustomReport.tsx (+104 -22)
📝 packages/desktop-client/src/components/reports/reports/GetCardData.tsx (+0 -2)
📝 packages/desktop-client/src/components/reports/reports/Spending.tsx (+1 -5)
📝 packages/desktop-client/src/components/reports/reports/SpendingCard.tsx (+1 -5)
📝 packages/desktop-client/src/components/reports/spreadsheets/custom-spreadsheet.ts (+0 -12)
📝 packages/desktop-client/src/components/reports/spreadsheets/grouped-spreadsheet.ts (+0 -11)
📝 packages/desktop-client/src/components/reports/spreadsheets/makeQuery.ts (+0 -15)
📝 packages/desktop-client/src/components/reports/spreadsheets/spending-spreadsheet.ts (+1 -9)
➕ packages/loot-core/migrations/1722717601000_reports_move_selected_categories.js (+55 -0)
📝 packages/loot-core/src/client/data-hooks/reports.ts (+0 -1)
📝 packages/loot-core/src/server/aql/schema/index.ts (+0 -1)
📝 packages/loot-core/src/server/migrate/migrations.ts (+2 -0)
📝 packages/loot-core/src/server/reports/app.ts (+0 -2)
📝 packages/loot-core/src/shared/rules.ts (+6 -0)
📝 packages/loot-core/src/types/models/reports.d.ts (+0 -3)
➕ upcoming-release-notes/3178.md (+6 -0)

📄 Description

TODO:

  • migration to move existing filters from selectedCategories to conditions
  • hide simple category selector if complex category filters are used

🔄 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/3178 **Author:** [@MatissJanis](https://github.com/MatissJanis) **Created:** 8/2/2024 **Status:** ✅ Merged **Merged:** 8/4/2024 **Merged by:** [@MatissJanis](https://github.com/MatissJanis) **Base:** `master` ← **Head:** `matiss/reports-selectedCategories` --- ### 📝 Commits (10+) - [`2d4059b`](https://github.com/actualbudget/actual/commit/2d4059b989adfb92cc481e5528faf3d17c087bc3) :recycle: (typescript) make category and rule types stricter - [`3289ce8`](https://github.com/actualbudget/actual/commit/3289ce8dbeb6c14ae1c80c21aae1adc366944018) :recycle: (reports) unify selectedCategories and conditions - [`e1e32cc`](https://github.com/actualbudget/actual/commit/e1e32cc15353e3f4c5cb01c3df7a6b89d309194d) Release notes - [`bc194db`](https://github.com/actualbudget/actual/commit/bc194db31372ab2db2028121fd2208c88f7535ef) Typechecker & linter - [`2041686`](https://github.com/actualbudget/actual/commit/20416866f78bd1ab1e30915ec5fed2f842e98de0) Merge branch 'master' into matiss/reports-selectedCategories - [`c0f4d7d`](https://github.com/actualbudget/actual/commit/c0f4d7ddc9334acabda2513cfaba7b959b09dd7c) Remove selectedCategories usage from queries and DB - [`1e7d9a5`](https://github.com/actualbudget/actual/commit/1e7d9a5eab6878107157d4f91394944a68b03a72) Category selector info message - [`ca93a98`](https://github.com/actualbudget/actual/commit/ca93a9891b6ef457ad4ef0d6b7dd347078b5dd94) Merge branch 'master' into matiss/reports-selectedCategories - [`dcec5ad`](https://github.com/actualbudget/actual/commit/dcec5ad350c766a5d954408c32811d31ac22261f) Migration - [`f9ef7f1`](https://github.com/actualbudget/actual/commit/f9ef7f14ae709e6e9b5d4e4d38f60de0599bea67) Feedback: update message ### 📊 Changes **17 files changed** (+200 additions, -101 deletions) <details> <summary>View changed files</summary> 📝 `packages/desktop-client/src/components/reports/ReportSidebar.tsx` (+24 -13) 📝 `packages/desktop-client/src/components/reports/reports/CustomReport.tsx` (+104 -22) 📝 `packages/desktop-client/src/components/reports/reports/GetCardData.tsx` (+0 -2) 📝 `packages/desktop-client/src/components/reports/reports/Spending.tsx` (+1 -5) 📝 `packages/desktop-client/src/components/reports/reports/SpendingCard.tsx` (+1 -5) 📝 `packages/desktop-client/src/components/reports/spreadsheets/custom-spreadsheet.ts` (+0 -12) 📝 `packages/desktop-client/src/components/reports/spreadsheets/grouped-spreadsheet.ts` (+0 -11) 📝 `packages/desktop-client/src/components/reports/spreadsheets/makeQuery.ts` (+0 -15) 📝 `packages/desktop-client/src/components/reports/spreadsheets/spending-spreadsheet.ts` (+1 -9) ➕ `packages/loot-core/migrations/1722717601000_reports_move_selected_categories.js` (+55 -0) 📝 `packages/loot-core/src/client/data-hooks/reports.ts` (+0 -1) 📝 `packages/loot-core/src/server/aql/schema/index.ts` (+0 -1) 📝 `packages/loot-core/src/server/migrate/migrations.ts` (+2 -0) 📝 `packages/loot-core/src/server/reports/app.ts` (+0 -2) 📝 `packages/loot-core/src/shared/rules.ts` (+6 -0) 📝 `packages/loot-core/src/types/models/reports.d.ts` (+0 -3) ➕ `upcoming-release-notes/3178.md` (+6 -0) </details> ### 📄 Description TODO: - [x] migration to move existing filters from `selectedCategories` to `conditions` - [x] hide simple category selector if complex category filters are used --- <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-02-28 21:00:17 -06: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#4724
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?