Skip to content

A local-first personal finance app

Apply Template to All Categories in Group for Web (#3666)

Dreptschara267e3abb5d8
diff --git a/packages/desktop-client/src/components/budget/BudgetCategories.jsx b/packages/desktop-client/src/components/budget/BudgetCategories.jsx
index d6a1a52f79..12efffd809 100644
--- a/packages/desktop-client/src/components/budget/BudgetCategories.jsx
+++ b/packages/desktop-client/src/components/budget/BudgetCategories.jsx
@@ -28,6 +28,7 @@ export const BudgetCategories = memo(
onSaveGroup,
onDeleteCategory,
onDeleteGroup,
+ onApplyBudgetTemplatesInGroup,
onReorderCategory,
onReorderGroup,
}) => {
@@ -245,6 +246,7 @@ export const BudgetCategories = memo(
onReorderCategory={onReorderCategory}
onToggleCollapse={onToggleCollapse}
onShowNewCategory={onShowNewCategory}
+ onApplyBudgetTemplatesInGroup={onApplyBudgetTemplatesInGroup}
/>
);
break;
diff --git a/packages/desktop-client/src/components/budget/BudgetTable.jsx b/packages/desktop-client/src/components/budget/BudgetTable.jsx
index 24d72bf871..785457f2ab 100644
--- a/packages/desktop-client/src/components/budget/BudgetTable.jsx
+++ b/packages/desktop-client/src/components/budget/BudgetTable.jsx
@@ -28,6 +28,7 @@ export function BudgetTable(props) {
onDeleteCategory,
onSaveGroup,
onDeleteGroup,
+ onApplyBudgetTemplatesInGroup,
onReorderCategory,
onReorderGroup,
onShowActivity,
@@ -235,6 +236,7 @@ export function BudgetTable(props) {
onReorderGroup={_onReorderGroup}
onBudgetAction={onBudgetAction}
onShowActivity={onShowActivity}
+ onApplyBudgetTemplatesInGroup={onApplyBudgetTemplatesInGroup}
/>
</View>
</View>
diff --git a/packages/desktop-client/src/components/budget/ExpenseGroup.tsx b/packages/desktop-client/src/components/budget/ExpenseGroup.tsx
index d30e7c4f3d..5fdbf16d84 100644
--- a/packages/desktop-client/src/components/budget/ExpenseGroup.tsx
+++ b/packages/desktop-client/src/components/budget/ExpenseGroup.tsx
@@ -25,6 +25,9 @@ type ExpenseGroupProps = {
onEditName?: ComponentProps<typeof SidebarGroup>['onEdit'];
onSave?: ComponentProps<typeof SidebarGroup>['onSave'];
onDelete?: ComponentProps<typeof SidebarGroup>['onDelete'];
+ onApplyBudgetTemplatesInGroup?: ComponentProps<
+ typeof SidebarGroup
+ >['onApplyBudgetTemplatesInGroup'];
onDragChange: OnDragChangeCallback<
ComponentProps<typeof SidebarGroup>['group']
>;
@@ -43,6 +46,7 @@ export function ExpenseGroup({
onEditName,
onSave,
onDelete,
+ onApplyBudgetTemplatesInGroup,
onDragChange,
onReorderGroup,
onReorderCategory,
@@ -125,6 +129,7 @@ export function ExpenseGroup({
onEdit={onEditName}
onSave={onSave}
onDelete={onDelete}
+ onApplyBudgetTemplatesInGroup={onApplyBudgetTemplatesInGroup}
onShowNewCategory={onShowNewCategory}
/>
<RenderMonths component={MonthComponent} args={{ group }} />
diff --git a/packages/desktop-client/src/components/budget/SidebarGroup.tsx b/packages/desktop-client/src/components/budget/SidebarGroup.tsx
index 530c8f334a..6230f35b3b 100644
--- a/packages/desktop-client/src/components/budget/SidebarGroup.tsx
+++ b/packages/desktop-client/src/components/budget/SidebarGroup.tsx
@@ -33,6 +33,7 @@ type SidebarGroupProps = {
onEdit?: (id: string) => void;
onSave?: (group: object) => Promise<void>;
onDelete?: (id: string) => Promise<void>;
+ onApplyBudgetTemplatesInGroup?: (categories: object[]) => void;
onShowNewCategory?: (groupId: string) => void;
onHideNewGroup?: () => void;
onToggleCollapse?: (id: string) => void;
@@ -48,11 +49,13 @@ export function SidebarGroup({
onEdit,
onSave,
onDelete,
+ onApplyBudgetTemplatesInGroup,
onShowNewCategory,
onHideNewGroup,
onToggleCollapse,
}: SidebarGroupProps) {
const { t } = useTranslation();
+ const isGoalTemplatesEnabled = useFeatureFlag('goalTemplatesEnabled');
const temporary = group.id === 'new';
const [menuOpen, setMenuOpen] = useState(false);
@@ -132,6 +135,12 @@ export function SidebarGroup({
onDelete(group.id);
} else if (type === 'toggle-visibility') {
onSave({ ...group, hidden: !group.hidden });
+ } else if (type === 'apply-multiple-category-template') {
+ onApplyBudgetTemplatesInGroup?.(
+ group.categories
+ .filter(c => !c['hidden'])
+ .map(c => c['id']),
+ );
}
setMenuOpen(false);
}}
@@ -143,6 +152,14 @@ export function SidebarGroup({
text: group.hidden ? t('Show') : t('Hide'),
},
onDelete && { name: 'delete', text: t('Delete') },
+ ...(isGoalTemplatesEnabled
+ ? [
+ {
+ name: 'apply-multiple-category-template',
+ text: t('Apply budget templates'),
+ },
+ ]
+ : []),
]}
/>
</Popover>
diff --git a/packages/desktop-client/src/components/budget/index.tsx b/packages/desktop-client/src/components/budget/index.tsx
index 397210c867..8abaf8de55 100644
--- a/packages/desktop-client/src/components/budget/index.tsx
+++ b/packages/desktop-client/src/components/budget/index.tsx
@@ -265,6 +265,15 @@ function BudgetInner(props: BudgetInnerProps) {
}
};
+ const onApplyBudgetTemplatesInGroup = async categories => {
+ dispatch(
+ applyBudgetAction(startMonth, 'apply-multiple-templates', {
+ month: startMonth,
+ categories,
+ }),
+ );
+ };
+
const onBudgetAction = (month, type, args) => {
dispatch(applyBudgetAction(month, type, args));
};
@@ -366,6 +375,7 @@ function BudgetInner(props: BudgetInnerProps) {
onMonthSelect={onMonthSelect}
onDeleteCategory={onDeleteCategory}
onDeleteGroup={onDeleteGroup}
+ onApplyBudgetTemplatesInGroup={onApplyBudgetTemplatesInGroup}
onSaveCategory={onSaveCategory}
onSaveGroup={onSaveGroup}
onBudgetAction={onBudgetAction}
diff --git a/packages/loot-core/src/client/actions/queries.ts b/packages/loot-core/src/client/actions/queries.ts
index f24c791230..25401608a5 100644
--- a/packages/loot-core/src/client/actions/queries.ts
+++ b/packages/loot-core/src/client/actions/queries.ts
@@ -102,6 +102,16 @@ export function applyBudgetAction(month, type, args) {
category: args.category,
});
break;
+ case 'apply-multiple-templates':
+ dispatch(
+ addNotification(
+ await send('budget/apply-multiple-templates', {
+ month,
+ categoryIds: args.categories,
+ }),
+ ),
+ );
+ break;
case 'set-single-3-avg':
await send('budget/set-n-month-avg', {
month,
diff --git a/packages/loot-core/src/server/budget/app.ts b/packages/loot-core/src/server/budget/app.ts
index a1816665d3..761a992dcf 100644
--- a/packages/loot-core/src/server/budget/app.ts
+++ b/packages/loot-core/src/server/budget/app.ts
@@ -29,6 +29,10 @@ app.method(
'budget/apply-goal-template',
mutator(undoable(goalActions.applyTemplate)),
);
+app.method(
+ 'budget/apply-multiple-templates',
+ mutator(undoable(goalActions.applyMultipleCategoryTemplates)),
+);
app.method(
'budget/overwrite-goal-template',
mutator(undoable(goalActions.overwriteTemplate)),
diff --git a/packages/loot-core/src/server/budget/goaltemplates.ts b/packages/loot-core/src/server/budget/goaltemplates.ts
index 516218496e..6e36660ec3 100644
--- a/packages/loot-core/src/server/budget/goaltemplates.ts
+++ b/packages/loot-core/src/server/budget/goaltemplates.ts
@@ -37,6 +37,23 @@ export async function overwriteTemplate({ month }) {
return ret;
}
+export async function applyMultipleCategoryTemplates({ month, categoryIds }) {
+ const placeholders = categoryIds.map(() => '?').join(', ');
+ const query = `SELECT * FROM v_categories WHERE id IN (${placeholders})`;
+ const categories = await db.all(query, categoryIds);
+ await storeTemplates();
+ const category_templates = await getTemplates(categories, 'template');
+ const category_goals = await getTemplates(categories, 'goal');
+ const ret = await processTemplate(
+ month,
+ true,
+ category_templates,
+ categories,
+ );
+ await processGoals(category_goals, month);
+ return ret;
+}
+
export async function applySingleCategoryTemplate({ month, category }) {
const categories = await db.all(`SELECT * FROM v_categories WHERE id = ?`, [
category,
@@ -48,7 +65,7 @@ export async function applySingleCategoryTemplate({ month, category }) {
month,
true,
category_templates,
- categories[0],
+ categories,
);
await processGoals(category_goals, month, categories[0]);
return ret;
@@ -135,7 +152,19 @@ async function getTemplates(category, directive: string) {
for (let ll = 0; ll < goal_def.length; ll++) {
templates[goal_def[ll].id] = JSON.parse(goal_def[ll].goal_def);
}
- if (category) {
+ if (Array.isArray(category)) {
+ const multipleCategoryTemplates = [];
+ for (let dd = 0; dd < category.length; dd++) {
+ const categoryId = category[dd].id;
+ if (templates[categoryId] !== undefined) {
+ multipleCategoryTemplates[categoryId] = templates[categoryId];
+ multipleCategoryTemplates[categoryId] = multipleCategoryTemplates[
+ categoryId
+ ].filter(t => t.directive === directive);
+ }
+ }
+ return multipleCategoryTemplates;
+ } else if (category) {
const singleCategoryTemplate = [];
if (templates[category.id] !== undefined) {
singleCategoryTemplate[category.id] = templates[category.id].filter(
@@ -174,11 +203,10 @@ async function processTemplate(
let categories = [];
const categories_remove = [];
if (category) {
- categories[0] = category;
+ categories = category;
} else {
categories = await getCategories();
}
-
//clears templated categories
for (let c = 0; c < categories.length; c++) {
const category = categories[c];
diff --git a/packages/loot-core/src/server/budget/types/handlers.d.ts b/packages/loot-core/src/server/budget/types/handlers.d.ts
index b5d6574369..a6c95addc5 100644
--- a/packages/loot-core/src/server/budget/types/handlers.d.ts
+++ b/packages/loot-core/src/server/budget/types/handlers.d.ts
@@ -79,4 +79,9 @@ export interface BudgetHandlers {
month: string;
category: string; //category id
}) => Promise<void>;
+
+ 'budget/apply-multiple-templates': (arg: {
+ month: string;
+ categoryIds: string[];
+ }) => Promise<Notification>;
}
diff --git a/upcoming-release-notes/3666.md b/upcoming-release-notes/3666.md
new file mode 100644
index 0000000000..84bcde2229
--- /dev/null
+++ b/upcoming-release-notes/3666.md
@@ -0,0 +1,6 @@
+---
+category: Enhancements
+authors: [Dreptschar]
+---
+
+Adds a Button to Group Menu that allows users to apply all Budget Templates in this Group