Skip to content

A local-first personal finance app

[AI] Remove grouped option from api/categories-get (#8415)

Matiss Janis Aboltinsb3748776ce9c
diff --git a/packages/api/methods.ts b/packages/api/methods.ts
index 8eb219af3c..a9c8736069 100644
--- a/packages/api/methods.ts
+++ b/packages/api/methods.ts
@@ -276,7 +276,7 @@ export function deleteCategoryGroup(
}
export function getCategories(options: { hidden?: boolean } = {}) {
- return send('api/categories-get', { grouped: false, ...options });
+ return send('api/categories-get', options);
}
export function createCategory(category: Omit<APICategoryEntity, 'id'>) {
diff --git a/packages/loot-core/src/server/api.ts b/packages/loot-core/src/server/api.ts
index a7236f67bc..1b0bc0069d 100644
--- a/packages/loot-core/src/server/api.ts
+++ b/packages/loot-core/src/server/api.ts
@@ -649,14 +649,11 @@ handlers['api/account-balance'] = withMutation(async function ({
});
handlers['api/categories-get'] = async function ({
- grouped,
hidden,
-}: { grouped?: boolean; hidden?: boolean } = {}) {
+}: { hidden?: boolean } = {}) {
checkFileOpen();
const result = await handlers['get-categories']({ hidden });
- return grouped
- ? result.grouped.map(group => categoryGroupModel.toExternal(group))
- : result.list.map(category => categoryModel.toExternal(category));
+ return result.list.map(category => categoryModel.toExternal(category));
};
handlers['api/category-groups-get'] = async function ({
diff --git a/packages/loot-core/src/server/importers/ynab4.ts b/packages/loot-core/src/server/importers/ynab4.ts
index 8d1050e3f0..021f5b6b87 100644
--- a/packages/loot-core/src/server/importers/ynab4.ts
+++ b/packages/loot-core/src/server/importers/ynab4.ts
@@ -133,9 +133,7 @@ async function importTransactions(
data: YNAB4.YFull,
entityIdMap: Map<string, string>,
) {
- const categories = await send('api/categories-get', {
- grouped: false,
- });
+ const categories = await send('api/categories-get');
const incomeCategoryId: string = categories.find(
cat => cat.name === 'Income',
).id;
diff --git a/packages/loot-core/src/server/importers/ynab5.ts b/packages/loot-core/src/server/importers/ynab5.ts
index b51ff9b1f1..2db585b135 100644
--- a/packages/loot-core/src/server/importers/ynab5.ts
+++ b/packages/loot-core/src/server/importers/ynab5.ts
@@ -291,9 +291,7 @@ async function importCategories(
// Hidden categories are put in its own group by YNAB,
// so it's already handled.
- const categories = await send('api/categories-get', {
- grouped: false,
- });
+ const categories = await send('api/categories-get');
const incomeCatId = findIdByName(categories, 'Income');
const ynabIncomeCategories = ['To be Budgeted', 'Inflow: Ready to Assign'];
@@ -572,9 +570,7 @@ export async function importTransactions(
flagNameConflicts: Set<string>,
) {
const payees = await send('api/payees-get');
- const categories = await send('api/categories-get', {
- grouped: false,
- });
+ const categories = await send('api/categories-get');
const incomeCatId = findIdByName(categories, 'Income');
const startingBalanceCatId = findIdByName(categories, 'Starting Balances'); //better way to do it?
diff --git a/packages/loot-core/src/types/api-handlers.ts b/packages/loot-core/src/types/api-handlers.ts
index 89cfb08258..54baacdd24 100644
--- a/packages/loot-core/src/types/api-handlers.ts
+++ b/packages/loot-core/src/types/api-handlers.ts
@@ -165,9 +165,8 @@ export type ApiHandlers = {
}) => Promise<number>;
'api/categories-get': (arg: {
- grouped?: boolean;
hidden?: boolean;
- }) => Promise<Array<APICategoryGroupEntity | APICategoryEntity>>;
+ }) => Promise<APICategoryEntity[]>;
'api/category-groups-get': (arg?: {
hidden?: boolean;
diff --git a/upcoming-release-notes/simplify-categories-get-api.md b/upcoming-release-notes/simplify-categories-get-api.md
new file mode 100644
index 0000000000..3270e8e004
--- /dev/null
+++ b/upcoming-release-notes/simplify-categories-get-api.md
@@ -0,0 +1,6 @@
+---
+category: Enhancements
+authors: [MatissJanis]
+---
+
+Simplify the getCategories API to always return a flat list of categories.