A local-first personal finance app
fix: prevent renaming category groups to existing names (#6499)
Ilia Skliarukfa45342d8d9b
diff --git a/packages/desktop-client/src/budget/budgetSlice.ts b/packages/desktop-client/src/budget/budgetSlice.tsindex 7ae5fe30f6..99eae90b1c 100644--- a/packages/desktop-client/src/budget/budgetSlice.ts+++ b/packages/desktop-client/src/budget/budgetSlice.ts@@ -104,9 +104,27 @@ type UpdateCategoryGroupPayload = {export const updateCategoryGroup = createAppAsyncThunk(`${sliceName}/updateCategoryGroup`,- async ({ group }: UpdateCategoryGroupPayload) => {+ async ({ group }: UpdateCategoryGroupPayload, { dispatch }) => {// Strip off the categories field if it exist. It's not a real db// field but groups have this extra field in the client most of the time+ const categoryGroups = await send('get-categories');+ if (+ categoryGroups.grouped.find(+ g =>+ g.id !== group.id &&+ g.name.toUpperCase() === group.name.toUpperCase(),+ )+ ) {+ dispatch(+ addNotification({+ notification: {+ type: 'error',+ message: t('A category group with this name already exists.'),+ },+ }),+ );+ return;+ }const { categories: _, ...groupNoCategories } = group;await send('category-group-update', groupNoCategories);},diff --git a/packages/loot-core/src/server/db/index.ts b/packages/loot-core/src/server/db/index.tsindex 120578c7c1..8b0070f102 100644--- a/packages/loot-core/src/server/db/index.ts+++ b/packages/loot-core/src/server/db/index.ts@@ -331,13 +331,13 @@ export async function getCategoriesGrouped(? `cg.id IN (${toSqlQueryParameters(ids)}) AND`: '';const categoryGroupQuery = `SELECT cg.* FROM category_groups cg WHERE ${categoryGroupWhereIn} cg.tombstone = 0- ORDER BY cg.is_income, cg.sort_order, cg.id`;+ ORDER BY cg.is_income, cg.sort_order, cg.id`;const categoryWhereIn = ids? `c.cat_group IN (${toSqlQueryParameters(ids)}) AND`: '';const categoryQuery = `SELECT c.* FROM categories c WHERE ${categoryWhereIn} c.tombstone = 0- ORDER BY c.sort_order, c.id`;+ ORDER BY c.sort_order, c.id`;const groups = ids? await all<DbCategoryGroup>(categoryGroupQuery, [...ids])@@ -385,9 +385,20 @@ export async function insertCategoryGroup(return id;}-export function updateCategoryGroup(- group: WithRequired<Partial<DbCategoryGroup>, 'name' | 'is_income'>,+export async function updateCategoryGroup(+ group: WithRequired<Partial<DbCategoryGroup>, 'id' | 'name' | 'is_income'>,) {+ const existingGroup = await first<+ Pick<DbCategoryGroup, 'id' | 'name' | 'hidden'>+ >(+ `SELECT id, name, hidden FROM category_groups WHERE UPPER(name) = ? AND id != ? AND tombstone = 0 LIMIT 1`,+ [group.name.toUpperCase(), group.id],+ );+ if (existingGroup) {+ throw new Error(+ `A ${existingGroup.hidden ? 'hidden ' : ''}'${existingGroup.name}' category group already exists.`,+ );+ }group = categoryGroupModel.validate(group, { update: true });return update('category_groups', group);}@@ -839,10 +850,10 @@ export function updateTag(tag) {export function findTags() {return all<{ notes: string }>(`- SELECT notes- FROM transactions- WHERE tombstone = 0 AND notes LIKE ?- `,+ SELECT notes+ FROM transactions+ WHERE tombstone = 0 AND notes LIKE ?+ `,['%#%'],);}diff --git a/upcoming-release-notes/6499.md b/upcoming-release-notes/6499.mdnew file mode 100644index 0000000000..bea3d95397--- /dev/null+++ b/upcoming-release-notes/6499.md@@ -0,0 +1,6 @@+---+category: Bugfix+authors: [skliaruk]+---++Prevent renaming category groups to existing names.