A local-first personal finance app
fix: apply context menu actions to all selected transactions and payees (#5269)
Margarida Reis333e7ff7bc7e
diff --git a/packages/desktop-client/src/components/payees/ManagePayees.tsx b/packages/desktop-client/src/components/payees/ManagePayees.tsxindex fa2bb6429f..c83ffc7410 100644--- a/packages/desktop-client/src/components/payees/ManagePayees.tsx+++ b/packages/desktop-client/src/components/payees/ManagePayees.tsx@@ -8,7 +8,7 @@ import {import { Trans, useTranslation } from 'react-i18next';import { Button } from '@actual-app/components/button';-import { SvgExpandArrow } from '@actual-app/components/icons/v0';+import { SvgExpandArrow, SvgSubtract } from '@actual-app/components/icons/v0';import { Popover } from '@actual-app/components/popover';import { theme } from '@actual-app/components/theme';import { View } from '@actual-app/components/view';@@ -61,6 +61,7 @@ function PayeeTableHeader() {exposed={true}focused={false}selected={selectedItems.size > 0}+ icon={<SvgSubtract width={6} height={6} />}onSelect={e =>dispatchSelected({ type: 'select-all', isRangeSelect: e.shiftKey })}@@ -323,7 +324,7 @@ export const ManagePayees = ({onUpdate={onUpdate}onViewRules={onViewRules}onCreateRule={onCreateRule}- onDelete={id => onDelete([{ id }])}+ onDelete={ids => onDelete(ids.map(id => ({ id })))}/>)}</View>diff --git a/packages/desktop-client/src/components/payees/PayeeTableRow.tsx b/packages/desktop-client/src/components/payees/PayeeTableRow.tsxindex 19339d01b2..76b809b286 100644--- a/packages/desktop-client/src/components/payees/PayeeTableRow.tsx+++ b/packages/desktop-client/src/components/payees/PayeeTableRow.tsx@@ -1,5 +1,5 @@// @ts-strict-ignore-import { memo, useRef, type CSSProperties } from 'react';+import { memo, useRef, useMemo, type CSSProperties } from 'react';import { Trans, useTranslation } from 'react-i18next';import {@@ -24,7 +24,10 @@ import {SelectCell,} from '@desktop-client/components/table';import { useContextMenu } from '@desktop-client/hooks/useContextMenu';-import { useSelectedDispatch } from '@desktop-client/hooks/useSelected';+import {+ useSelectedDispatch,+ useSelectedItems,+} from '@desktop-client/hooks/useSelected';import { useSyncedPref } from '@desktop-client/hooks/useSyncedPref';type RuleButtonProps = {@@ -89,7 +92,7 @@ type PayeeTableRowProps = {field: T,value: PayeeEntity[T],) => void;- onDelete: (id: PayeeEntity['id']) => void;+ onDelete: (ids: PayeeEntity['id'][]) => void;onViewRules: (id: PayeeEntity['id']) => void;onCreateRule: (id: PayeeEntity['id']) => void;style?: CSSProperties;@@ -113,6 +116,9 @@ export const PayeeTableRow = memo(}: PayeeTableRowProps) => {const { id } = payee;const dispatchSelected = useSelectedDispatch();+ const selectedItems = useSelectedItems();+ const selectedIds = useMemo(() => [...selectedItems], [selectedItems]);+const borderColor = selected? theme.tableBorderSelected: theme.tableBorder;@@ -169,7 +175,10 @@ export const PayeeTableRow = memo(text: payee.favorite ? t('Unfavorite') : t('Favorite'),},ruleCount > 0 && { name: 'view-rules', text: t('View rules') },- { name: 'create-rule', text: t('Create rule') },+ selectedIds.length === 1 && {+ name: 'create-rule',+ text: t('Create rule'),+ },isLearnCategoriesEnabled &&(payee.learn_categories? {@@ -181,13 +190,17 @@ export const PayeeTableRow = memo(onMenuSelect={name => {switch (name) {case 'delete':- onDelete(id);+ onDelete(selectedIds);break;case 'favorite':- onUpdate(id, 'favorite', !payee.favorite);+ selectedIds.forEach(id => {+ onUpdate(id, 'favorite', !payee.favorite);+ });break;case 'learn':- onUpdate(id, 'learn_categories', !payee.learn_categories);+ selectedIds.forEach(id => {+ onUpdate(id, 'learn_categories', !payee.learn_categories);+ });break;case 'view-rules':onViewRules(id);diff --git a/packages/desktop-client/src/components/table.tsx b/packages/desktop-client/src/components/table.tsxindex 28e8877efa..3c4e4d60e8 100644--- a/packages/desktop-client/src/components/table.tsx+++ b/packages/desktop-client/src/components/table.tsx@@ -624,6 +624,7 @@ type SelectCellProps = Omit<ComponentProps<typeof Cell>, 'children'> & {partial?: boolean;onEdit?: () => void;onSelect?: (e) => void;+ icon?: ReactNode;buttonProps?: Partial<CellButtonProps>;};export function SelectCell({@@ -632,6 +633,7 @@ export function SelectCell({style,onSelect,onEdit,+ icon = <SvgCheckmark width={6} height={6} />,buttonProps = {},...props}: SelectCellProps) {@@ -673,7 +675,7 @@ export function SelectCell({clickBehavior="none"{...buttonProps}>- {selected && <SvgCheckmark width={6} height={6} />}+ {selected && icon}</CellButton>)}</Cell>diff --git a/packages/desktop-client/src/components/transactions/TransactionMenu.tsx b/packages/desktop-client/src/components/transactions/TransactionMenu.tsxindex 6fd3a4e7e3..f4f5d815c6 100644--- a/packages/desktop-client/src/components/transactions/TransactionMenu.tsx+++ b/packages/desktop-client/src/components/transactions/TransactionMenu.tsx@@ -12,6 +12,7 @@ import { isPreviewId } from 'loot-core/shared/transactions';import { type TransactionEntity } from 'loot-core/types/models';import { useSchedules } from '@desktop-client/hooks/useSchedules';+import { useSelectedItems } from '@desktop-client/hooks/useSelected';import { pushModal } from '@desktop-client/modals/modalsSlice';import { useDispatch } from '@desktop-client/redux';@@ -19,22 +20,22 @@ type BalanceMenuProps = Omit<ComponentPropsWithoutRef<typeof Menu>,'onMenuSelect' | 'items'> & {- transaction: TransactionEntity;- onDuplicate: (id: string) => void;- onDelete: (id: string) => void;- onLinkSchedule: (id: string) => void;- onUnlinkSchedule: (id: string) => void;- onCreateRule: (id: string) => void;+ getTransaction: (id: string) => TransactionEntity | undefined;+ onDuplicate: (ids: string[]) => void;+ onDelete: (ids: string[]) => void;+ onLinkSchedule: (ids: string[]) => void;+ onUnlinkSchedule: (ids: string[]) => void;+ onCreateRule: (ids: string[]) => void;onScheduleAction: (name: 'skip' | 'post-transaction' | 'complete',- id: TransactionEntity['id'],+ ids: TransactionEntity['id'][],) => void;- onMakeAsNonSplitTransactions: (id: string) => void;+ onMakeAsNonSplitTransactions: (ids: string[]) => void;closeMenu: () => void;};export function TransactionMenu({- transaction,+ getTransaction,onDuplicate,onDelete,onLinkSchedule,@@ -47,43 +48,92 @@ export function TransactionMenu({}: BalanceMenuProps) {const { t } = useTranslation();const dispatch = useDispatch();+ const selectedItems = useSelectedItems();+ const selectedIds = useMemo(() => [...selectedItems], [selectedItems]);- const isPreview = isPreviewId(transaction.id);- const linked = !!transaction.schedule;- const canUnsplitTransactions =- !transaction.reconciled && (transaction.is_parent || transaction.is_child);+ const scheduleIds = useMemo(() => {+ return selectedIds+ .filter(id => isPreviewId(id))+ .map(id => id.split('/')[1]);+ }, [selectedIds]);- const scheduleId = isPreview ? transaction.id?.split('/')?.[1] : null;- const schedulesQuery = useMemo(- () => q('schedules').filter({ id: scheduleId }).select('*'),- [scheduleId],- );- const { isLoading: isSchedulesLoading, schedules } = useSchedules({- query: schedulesQuery,+ const scheduleQuery = useMemo(() => {+ return q('schedules')+ .filter({ id: { $oneof: scheduleIds } })+ .select('*');+ }, [scheduleIds]);++ const { schedules: selectedSchedules } = useSchedules({+ query: scheduleQuery,});- if (isSchedulesLoading) {- return null;- }+ const types = useMemo(() => {+ const items = selectedIds;+ return {+ preview: !!items.find(id => isPreviewId(id)),+ trans: !!items.find(id => !isPreviewId(id)),+ };+ }, [selectedIds]);- let canBeSkipped = false;- let canBeCompleted = false;- if (isPreview) {- const schedule = schedules?.[0];- const { date: dateCond } = extractScheduleConds(schedule._conditions);+ const ambiguousDuplication = useMemo(() => {+ const transactions = selectedIds.map(id => getTransaction(id));- canBeSkipped = scheduleIsRecurring(dateCond);- canBeCompleted = !scheduleIsRecurring(dateCond);- }+ return transactions.some(tx => tx && tx.is_child);+ }, [selectedIds, getTransaction]);++ const linked = useMemo(() => {+ return (+ !types.preview &&+ selectedIds.every(id => {+ const t = getTransaction(id);+ return t && t.schedule;+ })+ );+ }, [types.preview, selectedIds, getTransaction]);++ const canBeSkipped = useMemo(() => {+ const recurringSchedules = selectedSchedules.filter(s => {+ const { date: dateCond } = extractScheduleConds(s._conditions);+ return scheduleIsRecurring(dateCond);+ });++ return recurringSchedules.length === selectedSchedules.length;+ }, [selectedSchedules]);++ const canBeCompleted = useMemo(() => {+ const singleSchedules = selectedSchedules.filter(s => {+ const { date: dateCond } = extractScheduleConds(s._conditions);+ return !scheduleIsRecurring(dateCond);+ });++ return singleSchedules.length === selectedSchedules.length;+ }, [selectedSchedules]);++ const canUnsplitTransactions = useMemo(() => {+ if (selectedIds.length === 0 || types.preview) {+ return false;+ }++ const transactions = selectedIds.map(id => getTransaction(id));++ const areNoReconciledTransactions = transactions.every(+ tx => tx && !tx.reconciled,+ );+ const areAllSplitTransactions = transactions.every(+ tx => tx && (tx.is_parent || tx.is_child),+ );+ return areNoReconciledTransactions && areAllSplitTransactions;+ }, [selectedIds, types, getTransaction]);function onViewSchedule() {- const firstId = transaction.id;+ const firstId = selectedIds[0];let scheduleId;if (isPreviewId(firstId)) {const parts = firstId.split('/');scheduleId = parts[1];} else {- scheduleId = transaction.schedule;+ const trans = getTransaction(firstId);+ scheduleId = trans && trans.schedule;}if (scheduleId) {@@ -101,40 +151,42 @@ export function TransactionMenu({onMenuSelect={name => {switch (name) {case 'duplicate':- onDuplicate(transaction.id);+ onDuplicate(selectedIds);break;case 'delete':- onDelete(transaction.id);+ onDelete(selectedIds);break;case 'unsplit-transactions':- onMakeAsNonSplitTransactions(transaction.id);+ onMakeAsNonSplitTransactions(selectedIds);break;case 'post-transaction':case 'skip':case 'complete':- onScheduleAction(name, transaction.id);+ onScheduleAction(name, selectedIds);break;case 'view-schedule':onViewSchedule();break;case 'link-schedule':- onLinkSchedule(transaction.id);+ onLinkSchedule(selectedIds);break;case 'unlink-schedule':- onUnlinkSchedule(transaction.id);+ onUnlinkSchedule(selectedIds);break;case 'create-rule':- onCreateRule(transaction.id);+ onCreateRule(selectedIds);break;default:throw new Error(`Unrecognized menu option: ${name}`);}closeMenu();}}- items={- isPreview+ items={[+ ...(!types.trans? [- { name: 'view-schedule', text: t('View schedule') },+ ...(selectedIds.length === 1+ ? [{ name: 'view-schedule', text: t('View schedule') }]+ : []),{ name: 'post-transaction', text: t('Post transaction today') },...(canBeSkipped? [{ name: 'skip', text: t('Skip next scheduled date') }]@@ -144,17 +196,15 @@ export function TransactionMenu({: []),]: [- {- name: 'duplicate',- text: t('Duplicate'),- },+ ...(ambiguousDuplication+ ? []+ : [{ name: 'duplicate', text: t('Duplicate') }]),{ name: 'delete', text: t('Delete') },...(linked? [- {- name: 'view-schedule',- text: t('View schedule'),- },+ ...(selectedIds.length === 1+ ? [{ name: 'view-schedule', text: t('View schedule') }]+ : []),{ name: 'unlink-schedule', text: t('Unlink schedule') },]: [@@ -171,12 +221,14 @@ export function TransactionMenu({? [{name: 'unsplit-transactions',- text: t('Unsplit transaction'),+ text: t('Unsplit {{count}} transactions', {+ count: selectedIds.length,+ }),},]: []),- ]- }+ ]),+ ]}/>);}diff --git a/packages/desktop-client/src/components/transactions/TransactionsTable.tsx b/packages/desktop-client/src/components/transactions/TransactionsTable.tsxindex 571e355a61..55d7fbe734 100644--- a/packages/desktop-client/src/components/transactions/TransactionsTable.tsx+++ b/packages/desktop-client/src/components/transactions/TransactionsTable.tsx@@ -33,6 +33,7 @@ import {SvgArrowsSynchronize,SvgCalendar3,SvgHyperlink2,+ SvgSubtract,} from '@actual-app/components/icons/v2';import { Popover } from '@actual-app/components/popover';import { styles } from '@actual-app/components/styles';@@ -191,6 +192,7 @@ const TransactionHeader = memo(borderTopWidth: 0,borderBottomWidth: 0,}}+ icon={<SvgSubtract width={6} height={6} />}onSelect={(e: KeyboardEvent<HTMLDivElement>) =>dispatchSelected({type: 'select-all',@@ -837,15 +839,16 @@ type TransactionProps = {) => void;onEdit: (id: TransactionEntity['id'], field: string) => void;onDelete: (id: TransactionEntity['id']) => void;- onDuplicate?: (id: TransactionEntity['id']) => void;- onLinkSchedule?: (id: TransactionEntity['id']) => void;- onUnlinkSchedule?: (id: TransactionEntity['id']) => void;- onCreateRule?: (id: TransactionEntity['id']) => void;+ onBatchDelete?: (ids: TransactionEntity['id'][]) => void;+ onBatchDuplicate?: (ids: TransactionEntity['id'][]) => void;+ onBatchLinkSchedule?: (ids: TransactionEntity['id'][]) => void;+ onBatchUnlinkSchedule?: (ids: TransactionEntity['id'][]) => void;+ onCreateRule?: (ids: TransactionEntity['id'][]) => void;onScheduleAction?: (name: 'skip' | 'post-transaction' | 'complete',- id: TransactionEntity['id'],+ ids: TransactionEntity['id'][],) => void;- onMakeAsNonSplitTransactions?: (id: TransactionEntity['id']) => void;+ onMakeAsNonSplitTransactions?: (ids: TransactionEntity['id'][]) => void;onSplit: (id: TransactionEntity['id']) => void;onToggleSplit: (id: TransactionEntity['id']) => void;onCreatePayee: (name: string) => Promise<null | PayeeEntity['id']>;@@ -885,9 +888,10 @@ const Transaction = memo(function Transaction({onSave,onEdit,onDelete,- onDuplicate,- onLinkSchedule,- onUnlinkSchedule,+ onBatchDelete,+ onBatchDuplicate,+ onBatchLinkSchedule,+ onBatchUnlinkSchedule,onCreateRule,onScheduleAction,onMakeAsNonSplitTransactions,@@ -1148,17 +1152,15 @@ const Transaction = memo(function Transaction({isNonModal><TransactionMenu- transaction={transaction}- onDelete={() => onDelete?.(transaction.id)}- onDuplicate={() => onDuplicate?.(transaction.id)}- onLinkSchedule={() => onLinkSchedule?.(transaction.id)}- onUnlinkSchedule={() => onUnlinkSchedule?.(transaction.id)}- onCreateRule={() => onCreateRule?.(transaction.id)}- onScheduleAction={action =>- onScheduleAction?.(action, transaction.id)- }- onMakeAsNonSplitTransactions={() =>- onMakeAsNonSplitTransactions?.(transaction.id)+ getTransaction={id => allTransactions?.find(t => t.id === id)}+ onDelete={ids => onBatchDelete?.(ids)}+ onDuplicate={ids => onBatchDuplicate?.(ids)}+ onLinkSchedule={ids => onBatchLinkSchedule?.(ids)}+ onUnlinkSchedule={ids => onBatchUnlinkSchedule?.(ids)}+ onCreateRule={ids => onCreateRule?.(ids)}+ onScheduleAction={(name, ids) => onScheduleAction?.(name, ids)}+ onMakeAsNonSplitTransactions={ids =>+ onMakeAsNonSplitTransactions?.(ids)}closeMenu={() => setMenuOpen(false)}/>@@ -1944,19 +1946,20 @@ type TransactionTableInnerProps = {onNotesTagClick: (tag: string) => void;sortField: string;ascDesc: 'asc' | 'desc';- onCreateRule: (id: RuleEntity['id']) => void;+ onCreateRule: (ids: RuleEntity['id'][]) => void;onScheduleAction: (name: 'skip' | 'post-transaction' | 'complete',- id: TransactionEntity['id'],+ ids: TransactionEntity['id'][],) => void;- onMakeAsNonSplitTransactions: (id: string) => void;+ onMakeAsNonSplitTransactions: (ids: TransactionEntity['id'][]) => void;showSelection: boolean;allowSplitTransaction?: boolean;onDelete: (id: TransactionEntity['id']) => void;- onDuplicate: (id: TransactionEntity['id']) => void;- onLinkSchedule: (id: TransactionEntity['id']) => void;- onUnlinkSchedule: (id: TransactionEntity['id']) => void;+ onBatchDelete: (ids: TransactionEntity['id'][]) => void;+ onBatchDuplicate: (ids: TransactionEntity['id'][]) => void;+ onBatchLinkSchedule: (ids: TransactionEntity['id'][]) => void;+ onBatchUnlinkSchedule: (ids: TransactionEntity['id'][]) => void;onCheckNewEnter: (e: KeyboardEvent) => void;onCheckEnter: (e: KeyboardEvent) => void;onAddTemporary: (id?: TransactionEntity['id']) => void;@@ -2108,9 +2111,10 @@ function TransactionTableInner({onEdit={tableNavigator.onEdit}onSave={props.onSave}onDelete={props.onDelete}- onDuplicate={props.onDuplicate}- onLinkSchedule={props.onLinkSchedule}- onUnlinkSchedule={props.onUnlinkSchedule}+ onBatchDelete={props.onBatchDelete}+ onBatchDuplicate={props.onBatchDuplicate}+ onBatchLinkSchedule={props.onBatchLinkSchedule}+ onBatchUnlinkSchedule={props.onBatchUnlinkSchedule}onCreateRule={props.onCreateRule}onScheduleAction={props.onScheduleAction}onMakeAsNonSplitTransactions={props.onMakeAsNonSplitTransactions}@@ -2627,10 +2631,10 @@ export const TransactionTable = forwardRef(const {onSave: onSaveProp,onApplyRules: onApplyRulesProp,- onBatchDelete,- onBatchDuplicate,- onBatchLinkSchedule,- onBatchUnlinkSchedule,+ onBatchDelete: onBatchDeleteProp,+ onBatchDuplicate: onBatchDuplicateProp,+ onBatchLinkSchedule: onBatchLinkScheduleProp,+ onBatchUnlinkSchedule: onBatchUnlinkScheduleProp,onCreateRule: onCreateRuleProp,onScheduleAction: onScheduleActionProp,onMakeAsNonSplitTransactions: onMakeAsNonSplitTransactionsProp,@@ -2672,63 +2676,69 @@ export const TransactionTable = forwardRef([onSaveProp, onApplyRulesProp],);- const onDelete = useCallback(- (id: TransactionEntity['id']) => {- const temporary = isTemporaryId(id);+ const onDelete = useCallback((id: TransactionEntity['id']) => {+ const temporary = isTemporaryId(id);- if (temporary) {- const newTrans = latestState.current.newTransactions;+ if (temporary) {+ const newTrans = latestState.current.newTransactions;- if (id === newTrans[0].id) {- // You can never delete the parent new transaction- return;- }-- setNewTransactions(deleteTransaction(newTrans, id).data);- } else {- onBatchDelete([id]);+ if (id === newTrans[0].id) {+ // You can never delete the parent new transaction+ return;}++ setNewTransactions(deleteTransaction(newTrans, id).data);+ }+ }, []);++ const onBatchDelete = useCallback(+ (ids: TransactionEntity['id'][]) => {+ onBatchDeleteProp(ids);},- [onBatchDelete],+ [onBatchDeleteProp],);- const onDuplicate = useCallback(- (id: TransactionEntity['id']) => {- onBatchDuplicate([id]);+ const onBatchDuplicate = useCallback(+ (ids: TransactionEntity['id'][]) => {+ onBatchDuplicateProp(ids);},- [onBatchDuplicate],+ [onBatchDuplicateProp],);- const onLinkSchedule = useCallback(- (id: TransactionEntity['id']) => {- onBatchLinkSchedule([id]);+ const onBatchLinkSchedule = useCallback(+ (ids: TransactionEntity['id'][]) => {+ onBatchLinkScheduleProp(ids);},- [onBatchLinkSchedule],+ [onBatchLinkScheduleProp],);- const onUnlinkSchedule = useCallback(- (id: TransactionEntity['id']) => {- onBatchUnlinkSchedule([id]);++ const onBatchUnlinkSchedule = useCallback(+ (ids: TransactionEntity['id'][]) => {+ onBatchUnlinkScheduleProp(ids);},- [onBatchUnlinkSchedule],+ [onBatchUnlinkScheduleProp],);+const onCreateRule = useCallback(- (id: TransactionEntity['id']) => {- onCreateRuleProp([id]);+ (ids: TransactionEntity['id'][]) => {+ onCreateRuleProp(ids);},[onCreateRuleProp],);+const onScheduleAction = useCallback((action: 'skip' | 'post-transaction' | 'complete',- id: TransactionEntity['id'],+ ids: TransactionEntity['id'][],) => {- onScheduleActionProp(action, [id]);+ onScheduleActionProp(action, ids);},[onScheduleActionProp],);+const onMakeAsNonSplitTransactions = useCallback(- (id: TransactionEntity['id']) => {- onMakeAsNonSplitTransactionsProp([id]);+ (ids: TransactionEntity['id'][]) => {+ onMakeAsNonSplitTransactionsProp(ids);},[onMakeAsNonSplitTransactionsProp],);@@ -2899,9 +2909,10 @@ export const TransactionTable = forwardRef(isExpanded={splitsExpanded.isExpanded}onSave={onSave}onDelete={onDelete}- onDuplicate={onDuplicate}- onLinkSchedule={onLinkSchedule}- onUnlinkSchedule={onUnlinkSchedule}+ onBatchDelete={onBatchDelete}+ onBatchDuplicate={onBatchDuplicate}+ onBatchLinkSchedule={onBatchLinkSchedule}+ onBatchUnlinkSchedule={onBatchUnlinkSchedule}onCreateRule={onCreateRule}onScheduleAction={onScheduleAction}onMakeAsNonSplitTransactions={onMakeAsNonSplitTransactions}diff --git a/upcoming-release-notes/5269.md b/upcoming-release-notes/5269.mdnew file mode 100644index 0000000000..11139cb3ac--- /dev/null+++ b/upcoming-release-notes/5269.md@@ -0,0 +1,6 @@+---+category: Bugfix+authors: [tostasmistas]+---++Apply context menu actions to all selected transactions and payees