A local-first personal finance app
♻️ (typescript) migrated ManagePayees and LoadBackupModal files (#3507)
Matiss Janis Aboltinsf3ae31055e64
diff --git a/packages/desktop-client/src/components/autocomplete/PayeeAutocomplete.test.tsx b/packages/desktop-client/src/components/autocomplete/PayeeAutocomplete.test.tsxindex 0bc3f317b3..e248b8cf2f 100644--- a/packages/desktop-client/src/components/autocomplete/PayeeAutocomplete.test.tsx+++ b/packages/desktop-client/src/components/autocomplete/PayeeAutocomplete.test.tsx@@ -38,7 +38,7 @@ function makePayee(name: string, options?: { favorite: boolean }): PayeeEntity {return {id: name.toLowerCase() + '-id',name,- favorite: options?.favorite ?? false,+ favorite: options?.favorite ? 1 : 0,transfer_acct: undefined,};}diff --git a/packages/desktop-client/src/components/autocomplete/PayeeAutocomplete.tsx b/packages/desktop-client/src/components/autocomplete/PayeeAutocomplete.tsxindex ea4d479139..e567804f65 100644--- a/packages/desktop-client/src/components/autocomplete/PayeeAutocomplete.tsx+++ b/packages/desktop-client/src/components/autocomplete/PayeeAutocomplete.tsx@@ -316,7 +316,7 @@ export function PayeeAutocomplete({return filteredSuggestions;}- return [{ id: 'new', favorite: false, name: '' }, ...filteredSuggestions];+ return [{ id: 'new', favorite: 0, name: '' }, ...filteredSuggestions];}, [commonPayees, payees, focusTransferPayees, accounts, hasPayeeInput]);const dispatch = useDispatch();diff --git a/packages/desktop-client/src/components/modals/LoadBackupModal.jsx b/packages/desktop-client/src/components/modals/LoadBackupModal.tsxsimilarity index 71%rename from packages/desktop-client/src/components/modals/LoadBackupModal.jsxrename to packages/desktop-client/src/components/modals/LoadBackupModal.tsxindex 84c8f68ff5..b40b659d08 100644--- a/packages/desktop-client/src/components/modals/LoadBackupModal.jsx+++ b/packages/desktop-client/src/components/modals/LoadBackupModal.tsx@@ -1,7 +1,8 @@-import React, { Component, useState, useEffect } from 'react';+import React, { useState, useEffect } from 'react';import { useDispatch } from 'react-redux';import { loadBackup, makeBackup } from 'loot-core/client/actions';+import { type Backup } from 'loot-core/server/backups';import { send, listen, unlisten } from 'loot-core/src/platform/client/fetch';import { useMetadataPref } from '../../hooks/useMetadataPref';@@ -13,48 +14,47 @@ import { Text } from '../common/Text';import { View } from '../common/View';import { Row, Cell } from '../table';-class BackupTable extends Component {- state = { hoveredBackup: null };+type BackupTableProps = {+ backups: Backup[];+ onSelect: (backupId: string) => void;+};- onHover = id => {- this.setState({ hoveredBackup: id });- };-- render() {- const { backups, onSelect } = this.props;- const { hoveredBackup } = this.state;-- return (- <View- style={{ flex: 1, maxHeight: 200, overflow: 'auto' }}- onMouseLeave={() => this.onHover(null)}- >- {backups.map((backup, idx) => (- <Row- key={backup.id}- collapsed={idx !== 0}- focused={hoveredBackup === backup.id}- onMouseEnter={() => this.onHover(backup.id)}- onClick={() => onSelect(backup.id)}- style={{ cursor: 'pointer' }}- >- <Cell- width="flex"- value={backup.date ? backup.date : 'Revert to Latest'}- valueStyle={{ paddingLeft: 20 }}- />- </Row>- ))}- </View>- );- }+function BackupTable({ backups, onSelect }: BackupTableProps) {+ return (+ <View style={{ flex: 1, maxHeight: 200, overflow: 'auto' }}>+ {backups.map((backup, idx) => (+ <Row+ key={backup.id}+ collapsed={idx !== 0}+ onClick={() => onSelect(backup.id)}+ style={{ cursor: 'pointer' }}+ >+ <Cell+ width="flex"+ value={backup.date ? backup.date : 'Revert to Latest'}+ valueStyle={{ paddingLeft: 20 }}+ />+ </Row>+ ))}+ </View>+ );}-export function LoadBackupModal({ budgetId, watchUpdates, backupDisabled }) {+type LoadBackupModalProps = {+ budgetId: string;+ watchUpdates: boolean;+ backupDisabled: boolean;+};++export function LoadBackupModal({+ budgetId,+ watchUpdates,+ backupDisabled,+}: LoadBackupModalProps) {const dispatch = useDispatch();- const [backups, setBackups] = useState([]);+ const [backups, setBackups] = useState<Backup[]>([]);const [prefsBudgetId] = useMetadataPref('id');- const budgetIdToLoad = budgetId || prefsBudgetId;+ const budgetIdToLoad = budgetId ?? prefsBudgetId;useEffect(() => {send('backups-get', { id: budgetIdToLoad }).then(setBackups);@@ -63,12 +63,16 @@ export function LoadBackupModal({ budgetId, watchUpdates, backupDisabled }) {useEffect(() => {if (watchUpdates) {listen('backups-updated', setBackups);- return () => unlisten('backups-updated', setBackups);+ return () => unlisten('backups-updated');}}, [watchUpdates]);- const latestBackup = backups.find(backup => backup.isLatest);- const previousBackups = backups.filter(backup => !backup.isLatest);+ const latestBackup = backups.find(backup =>+ 'isLatest' in backup ? backup.isLatest : false,+ );+ const previousBackups = backups.filter(+ backup => !('isLatest' in backup ? backup.isLatest : false),+ );return (<Modal name="load-backup" containerProps={{ style: { maxWidth: '30vw' } }}>diff --git a/packages/desktop-client/src/components/payees/ManagePayees.jsx b/packages/desktop-client/src/components/payees/ManagePayees.jsxdeleted file mode 100644index 2843bc644b..0000000000--- a/packages/desktop-client/src/components/payees/ManagePayees.jsx+++ /dev/null@@ -1,355 +0,0 @@-import {- forwardRef,- useState,- useEffect,- useLayoutEffect,- useRef,- useMemo,- useCallback,- useImperativeHandle,-} from 'react';--import memoizeOne from 'memoize-one';--import { getNormalisedString } from 'loot-core/src/shared/normalisation';-import { groupById } from 'loot-core/src/shared/util';--import {- useSelected,- SelectedProvider,- useSelectedDispatch,- useSelectedItems,-} from '../../hooks/useSelected';-import { useStableCallback } from '../../hooks/useStableCallback';-import { SvgExpandArrow } from '../../icons/v0';-import { theme } from '../../style';-import { Button } from '../common/Button2';-import { Popover } from '../common/Popover';-import { Search } from '../common/Search';-import { View } from '../common/View';-import { TableHeader, Cell, SelectCell, useTableNavigator } from '../table';--import { PayeeMenu } from './PayeeMenu';-import { PayeeTable } from './PayeeTable';--const getPayeesById = memoizeOne(payees => groupById(payees));--function plural(count, singleText, pluralText) {- return count === 1 ? singleText : pluralText;-}--function PayeeTableHeader() {- const borderColor = theme.tableborder;- const dispatchSelected = useSelectedDispatch();- const selectedItems = useSelectedItems();-- return (- <View>- <TableHeader- style={{- borderColor,- backgroundColor: theme.tableBackground,- color: theme.pageTextLight,- zIndex: 200,- userSelect: 'none',- }}- collapsed={true}- >- <SelectCell- exposed={true}- focused={false}- selected={selectedItems.size > 0}- onSelect={e =>- dispatchSelected({ type: 'select-all', isRangeSelect: e.shiftKey })- }- />- <Cell value="Name" width="flex" />- </TableHeader>- </View>- );-}--function EmptyMessage({ text, style }) {- return (- <View- style={{- textAlign: 'center',- color: theme.pageTextSubdued,- fontStyle: 'italic',- fontSize: 13,- marginTop: 5,- style,- }}- >- {text}- </View>- );-}--export const ManagePayees = forwardRef(- (- {- payees,- ruleCounts,- orphanedPayees,- categoryGroups,- initialSelectedIds,- ruleActions,- onBatchChange,- onViewRules,- onCreateRule,- ...props- },- ref,- ) => {- const [highlightedRows, setHighlightedRows] = useState(null);- const [filter, setFilter] = useState('');- const table = useRef(null);- const scrollTo = useRef(null);- const triggerRef = useRef(null);- const resetAnimation = useRef(false);- const [orphanedOnly, setOrphanedOnly] = useState(false);-- const filteredPayees = useMemo(() => {- let filtered = payees;- if (filter) {- filtered = filtered.filter(p =>- getNormalisedString(p.name).includes(getNormalisedString(filter)),- );- }- if (orphanedOnly) {- filtered = filtered.filter(p =>- orphanedPayees.map(o => o.id).includes(p.id),- );- }- return filtered;- }, [payees, filter, orphanedOnly]);-- const selected = useSelected('payees', filteredPayees, initialSelectedIds);-- function applyFilter(f) {- if (filter !== f) {- table.current?.setRowAnimation(false);- setFilter(f);- resetAnimation.current = true;- }- }-- function _scrollTo(id) {- applyFilter('');- scrollTo.current = id;- }-- useEffect(() => {- if (resetAnimation.current) {- // Very annoying, for some reason it's as if the table doesn't- // actually update its contents until the next tick or- // something? The table keeps being animated without this- setTimeout(() => {- table.current?.setRowAnimation(true);- }, 0);- resetAnimation.current = false;- }- });-- useImperativeHandle(ref, () => ({- selectRows: (ids, scroll) => {- tableNavigator.onEdit(null);- selected.dispatch({ type: 'select-all', ids });- setHighlightedRows(null);-- if (scroll && ids.length > 0) {- _scrollTo(ids[0]);- }- },-- highlightRow: id => {- tableNavigator.onEdit(null);- setHighlightedRows(new Set([id]));- _scrollTo(id);- },- }));-- // `highlightedRows` should only ever be true once, and we- // immediately discard it. This triggers an animation.- useEffect(() => {- if (highlightedRows) {- setHighlightedRows(null);- }- }, [highlightedRows]);-- useLayoutEffect(() => {- if (scrollTo.current) {- table.current.scrollTo(scrollTo.current);- scrollTo.current = null;- }- });-- const onUpdate = useStableCallback((id, name, value) => {- const payee = payees.find(p => p.id === id);- if (payee[name] !== value) {- onBatchChange({ updated: [{ id, [name]: value }] });- }- });-- const getSelectableIds = useCallback(() => {- return filteredPayees.filter(p => p.transfer_acct == null).map(p => p.id);- }, [filteredPayees]);-- function onDelete() {- onBatchChange({ deleted: [...selected.items].map(id => ({ id })) });- selected.dispatch({ type: 'select-none' });- }-- function onFavorite() {- const allFavorited = [...selected.items]- .map(id => payeesById[id].favorite)- .every(f => f === 1);- if (allFavorited) {- onBatchChange({- updated: [...selected.items].map(id => ({ id, favorite: 0 })),- });- } else {- onBatchChange({- updated: [...selected.items].map(id => ({ id, favorite: 1 })),- });- }- selected.dispatch({ type: 'select-none' });- }-- async function onMerge() {- const ids = [...selected.items];- await props.onMerge(ids);-- tableNavigator.onEdit(ids[0], 'name');- selected.dispatch({ type: 'select-none' });- _scrollTo(ids[0]);- }-- const buttonsDisabled = selected.items.size === 0;-- const tableNavigator = useTableNavigator(filteredPayees, item =>- ['select', 'name', 'rule-count'].filter(name => {- switch (name) {- case 'select':- return item.transfer_acct == null;- default:- return true;- }- }),- );-- const payeesById = getPayeesById(payees);-- const [menuOpen, setMenuOpen] = useState(false);-- return (- <View style={{ height: '100%' }}>- <View- style={{- flexDirection: 'row',- alignItems: 'center',- padding: '0 0 15px',- }}- >- <View style={{ flexShrink: 0 }}>- <Button- ref={triggerRef}- variant="bare"- style={{ marginRight: 10 }}- isDisabled={buttonsDisabled}- onPress={() => setMenuOpen(true)}- >- {buttonsDisabled- ? 'No payees selected'- : selected.items.size +- ' ' +- plural(selected.items.size, 'payee', 'payees')}- <SvgExpandArrow width={8} height={8} style={{ marginLeft: 5 }} />- </Button>-- <Popover- triggerRef={triggerRef}- isOpen={menuOpen}- placement="bottom start"- style={{ width: 250 }}- onOpenChange={() => setMenuOpen(false)}- >- <PayeeMenu- payeesById={payeesById}- selectedPayees={selected.items}- onClose={() => setMenuOpen(false)}- onDelete={onDelete}- onMerge={onMerge}- onFavorite={onFavorite}- />- </Popover>- </View>- <View- style={{- flexShrink: 0,- }}- >- {(orphanedOnly ||- (orphanedPayees && orphanedPayees.length > 0)) && (- <Button- variant="bare"- style={{ marginRight: 10 }}- onPress={() => {- setOrphanedOnly(!orphanedOnly);- applyFilter(filter);- tableNavigator.onEdit(null);- }}- >- {orphanedOnly- ? 'Show all payees'- : `Show ${- orphanedPayees.length === 1- ? '1 unused payee'- : `${orphanedPayees.length} unused payees`- }`}- </Button>- )}- </View>- <View style={{ flex: 1 }} />- <Search- id="filter-input"- placeholder="Filter payees..."- value={filter}- onChange={applyFilter}- />- </View>-- <SelectedProvider instance={selected} fetchAllIds={getSelectableIds}>- <View- style={{- flex: 1,- border: '1px solid ' + theme.tableBorder,- borderTopLeftRadius: 4,- borderTopRightRadius: 4,- overflow: 'hidden',- }}- >- <PayeeTableHeader />- {filteredPayees.length === 0 ? (- <EmptyMessage text="No payees" style={{ marginTop: 15 }} />- ) : (- <PayeeTable- ref={table}- payees={filteredPayees}- ruleCounts={ruleCounts}- categoryGroups={categoryGroups}- navigator={tableNavigator}- onUpdate={onUpdate}- onViewRules={onViewRules}- onCreateRule={onCreateRule}- />- )}- </View>- </SelectedProvider>- </View>- );- },-);--ManagePayees.displayName = 'ManagePayees';diff --git a/packages/desktop-client/src/components/payees/ManagePayees.tsx b/packages/desktop-client/src/components/payees/ManagePayees.tsxnew file mode 100644index 0000000000..b9c37160d6--- /dev/null+++ b/packages/desktop-client/src/components/payees/ManagePayees.tsx@@ -0,0 +1,284 @@+import {+ useState,+ useRef,+ useMemo,+ useCallback,+ type ComponentProps,+} from 'react';++import memoizeOne from 'memoize-one';++import { getNormalisedString } from 'loot-core/src/shared/normalisation';+import { groupById } from 'loot-core/src/shared/util';+import { type PayeeEntity } from 'loot-core/types/models';++import {+ useSelected,+ SelectedProvider,+ useSelectedDispatch,+ useSelectedItems,+} from '../../hooks/useSelected';+import { SvgExpandArrow } from '../../icons/v0';+import { theme } from '../../style';+import { Button } from '../common/Button2';+import { Popover } from '../common/Popover';+import { Search } from '../common/Search';+import { View } from '../common/View';+import { TableHeader, Cell, SelectCell } from '../table';++import { PayeeMenu } from './PayeeMenu';+import { PayeeTable } from './PayeeTable';++const getPayeesById = memoizeOne((payees: PayeeEntity[]) => groupById(payees));++function plural(count: number, singleText: string, pluralText: string) {+ return count === 1 ? singleText : pluralText;+}++function PayeeTableHeader() {+ const dispatchSelected = useSelectedDispatch();+ const selectedItems = useSelectedItems();++ return (+ <View>+ <TableHeader+ style={{+ backgroundColor: theme.tableBackground,+ color: theme.pageTextLight,+ zIndex: 200,+ userSelect: 'none',+ }}+ collapsed={true}+ >+ <SelectCell+ exposed={true}+ focused={false}+ selected={selectedItems.size > 0}+ onSelect={e =>+ dispatchSelected({ type: 'select-all', isRangeSelect: e.shiftKey })+ }+ />+ <Cell value="Name" width="flex" />+ </TableHeader>+ </View>+ );+}++type ManagePayeesProps = {+ payees: PayeeEntity[];+ ruleCounts: ComponentProps<typeof PayeeTable>['ruleCounts'];+ orphanedPayees: PayeeEntity[];+ initialSelectedIds: string[];+ onBatchChange: (arg: {+ deleted?: Array<{ id: string }>;+ updated?: Array<{ id: string; name?: string; favorite?: 0 | 1 }>;+ }) => void;+ onViewRules: ComponentProps<typeof PayeeTable>['onViewRules'];+ onCreateRule: ComponentProps<typeof PayeeTable>['onCreateRule'];+ onMerge: (ids: string[]) => Promise<void>;+};++export const ManagePayees = ({+ payees,+ ruleCounts,+ orphanedPayees,+ initialSelectedIds,+ onBatchChange,+ onViewRules,+ onCreateRule,+ ...props+}: ManagePayeesProps) => {+ const [filter, setFilter] = useState('');+ const table = useRef(null);+ const triggerRef = useRef(null);+ const [orphanedOnly, setOrphanedOnly] = useState(false);++ const filteredPayees = useMemo(() => {+ let filtered = payees;+ if (filter) {+ filtered = filtered.filter(p =>+ getNormalisedString(p.name).includes(getNormalisedString(filter)),+ );+ }+ if (orphanedOnly) {+ filtered = filtered.filter(p =>+ orphanedPayees.map(o => o.id).includes(p.id),+ );+ }+ return filtered;+ }, [payees, filter, orphanedOnly, orphanedPayees]);++ const selected = useSelected('payees', filteredPayees, initialSelectedIds);++ function applyFilter(f: string) {+ if (filter !== f) {+ setFilter(f);+ }+ }++ const onUpdate = useCallback(+ <T extends 'name' | 'favorite'>(+ id: PayeeEntity['id'],+ name: T,+ value: PayeeEntity[T],+ ) => {+ const payee = payees.find(p => p.id === id);+ if (payee && payee[name] !== value) {+ onBatchChange({ updated: [{ id, [name]: value }] });+ }+ },+ [payees, onBatchChange],+ );++ const getSelectableIds = useCallback(() => {+ return Promise.resolve(+ filteredPayees.filter(p => p.transfer_acct == null).map(p => p.id),+ );+ }, [filteredPayees]);++ function onDelete() {+ onBatchChange({ deleted: [...selected.items].map(id => ({ id })) });+ selected.dispatch({ type: 'select-none' });+ }++ function onFavorite() {+ const allFavorited = [...selected.items]+ .map(id => payeesById[id].favorite)+ .every(f => f === 1);+ if (allFavorited) {+ onBatchChange({+ updated: [...selected.items].map(id => ({ id, favorite: 0 })),+ });+ } else {+ onBatchChange({+ updated: [...selected.items].map(id => ({ id, favorite: 1 })),+ });+ }+ selected.dispatch({ type: 'select-none' });+ }++ async function onMerge() {+ const ids = [...selected.items];+ await props.onMerge(ids);++ selected.dispatch({ type: 'select-none' });+ }++ const buttonsDisabled = selected.items.size === 0;++ const payeesById = getPayeesById(payees);++ const [menuOpen, setMenuOpen] = useState(false);++ return (+ <View style={{ height: '100%' }}>+ <View+ style={{+ flexDirection: 'row',+ alignItems: 'center',+ padding: '0 0 15px',+ }}+ >+ <View style={{ flexShrink: 0 }}>+ <Button+ ref={triggerRef}+ variant="bare"+ style={{ marginRight: 10 }}+ isDisabled={buttonsDisabled}+ onPress={() => setMenuOpen(true)}+ >+ {buttonsDisabled+ ? 'No payees selected'+ : selected.items.size ++ ' ' ++ plural(selected.items.size, 'payee', 'payees')}+ <SvgExpandArrow width={8} height={8} style={{ marginLeft: 5 }} />+ </Button>++ <Popover+ triggerRef={triggerRef}+ isOpen={menuOpen}+ placement="bottom start"+ style={{ width: 250 }}+ onOpenChange={() => setMenuOpen(false)}+ >+ <PayeeMenu+ payeesById={payeesById}+ selectedPayees={selected.items}+ onClose={() => setMenuOpen(false)}+ onDelete={onDelete}+ onMerge={onMerge}+ onFavorite={onFavorite}+ />+ </Popover>+ </View>+ <View+ style={{+ flexShrink: 0,+ }}+ >+ {(orphanedOnly || (orphanedPayees && orphanedPayees.length > 0)) && (+ <Button+ variant="bare"+ style={{ marginRight: 10 }}+ onPress={() => {+ setOrphanedOnly(!orphanedOnly);+ applyFilter(filter);+ }}+ >+ {orphanedOnly+ ? 'Show all payees'+ : `Show ${+ orphanedPayees.length === 1+ ? '1 unused payee'+ : `${orphanedPayees.length} unused payees`+ }`}+ </Button>+ )}+ </View>+ <View style={{ flex: 1 }} />+ <Search+ placeholder="Filter payees..."+ value={filter}+ onChange={applyFilter}+ />+ </View>++ <SelectedProvider instance={selected} fetchAllIds={getSelectableIds}>+ <View+ style={{+ flex: 1,+ border: '1px solid ' + theme.tableBorder,+ borderTopLeftRadius: 4,+ borderTopRightRadius: 4,+ overflow: 'hidden',+ }}+ >+ <PayeeTableHeader />+ {filteredPayees.length === 0 ? (+ <View+ style={{+ textAlign: 'center',+ color: theme.pageTextSubdued,+ fontStyle: 'italic',+ fontSize: 13,+ marginTop: 5,+ }}+ >+ No payees+ </View>+ ) : (+ <PayeeTable+ ref={table}+ payees={filteredPayees}+ ruleCounts={ruleCounts}+ onUpdate={onUpdate}+ onViewRules={onViewRules}+ onCreateRule={onCreateRule}+ />+ )}+ </View>+ </SelectedProvider>+ </View>+ );+};diff --git a/packages/desktop-client/src/components/payees/ManagePayeesWithData.jsx b/packages/desktop-client/src/components/payees/ManagePayeesWithData.jsxindex 55ea8bc78a..423a41132d 100644--- a/packages/desktop-client/src/components/payees/ManagePayeesWithData.jsx+++ b/packages/desktop-client/src/components/payees/ManagePayeesWithData.jsx@@ -1,4 +1,4 @@-import React, { useState, useEffect, useRef } from 'react';+import React, { useState, useEffect } from 'react';import { useSelector } from 'react-redux';import { send, listen } from 'loot-core/src/platform/client/fetch';@@ -21,7 +21,6 @@ export function ManagePayeesWithData({ initialSelectedIds }) {const [payees, setPayees] = useState(initialPayees);const [ruleCounts, setRuleCounts] = useState({ value: new Map() });const [orphans, setOrphans] = useState({ value: new Map() });- const payeesRef = useRef();async function refetchOrphanedPayees() {const orphs = await send('payees-get-orphaned');@@ -120,7 +119,6 @@ export function ManagePayeesWithData({ initialSelectedIds }) {return (<ManagePayees- ref={payeesRef}payees={payees}ruleCounts={ruleCounts.value}orphanedPayees={orphans}diff --git a/packages/desktop-client/src/components/payees/PayeeMenu.tsx b/packages/desktop-client/src/components/payees/PayeeMenu.tsxindex a2c3c12c66..c9229e1a99 100644--- a/packages/desktop-client/src/components/payees/PayeeMenu.tsx+++ b/packages/desktop-client/src/components/payees/PayeeMenu.tsx@@ -11,7 +11,7 @@ type PayeeMenuProps = {selectedPayees: Set<PayeeEntity['id']>;onDelete: () => void;onMerge: () => Promise<void>;- onFavorite: () => Promise<void>;+ onFavorite: () => void;onClose: () => void;};diff --git a/packages/desktop-client/src/components/payees/PayeeTable.tsx b/packages/desktop-client/src/components/payees/PayeeTable.tsxindex 3efbaaad8e..0854243993 100644--- a/packages/desktop-client/src/components/payees/PayeeTable.tsx+++ b/packages/desktop-client/src/components/payees/PayeeTable.tsx@@ -12,7 +12,7 @@ import { type PayeeEntity } from 'loot-core/src/types/models';import { useSelectedItems } from '../../hooks/useSelected';import { View } from '../common/View';-import { Table, type TableNavigator } from '../table';+import { Table } from '../table';import { PayeeTableRow } from './PayeeTableRow';@@ -23,7 +23,6 @@ type PayeeWithId = PayeeEntity & Required<Pick<PayeeEntity, 'id'>>;type PayeeTableProps = {payees: PayeeWithId[];ruleCounts: Map<PayeeWithId['id'], number>;- navigator: TableNavigator<PayeeWithId>;} & Pick<ComponentProps<typeof PayeeTableRow>,'onUpdate' | 'onViewRules' | 'onCreateRule'@@ -32,53 +31,46 @@ type PayeeTableProps = {export const PayeeTable = forwardRef<ComponentRef<typeof Table<PayeeWithId>>,PayeeTableProps->(- (- { payees, ruleCounts, navigator, onUpdate, onViewRules, onCreateRule },- ref,- ) => {- const [hovered, setHovered] = useState(null);- const selectedItems = useSelectedItems();+>(({ payees, ruleCounts, onUpdate, onViewRules, onCreateRule }, ref) => {+ const [hovered, setHovered] = useState(null);+ const selectedItems = useSelectedItems();- useLayoutEffect(() => {- const firstSelected = [...selectedItems][0] as string;- if (typeof ref !== 'function') {- ref.current.scrollTo(firstSelected, 'center');- }- navigator.onEdit(firstSelected, 'select');- }, []);+ useLayoutEffect(() => {+ const firstSelected = [...selectedItems][0] as string;+ if (typeof ref !== 'function') {+ ref.current.scrollTo(firstSelected, 'center');+ }+ }, []);- const onHover = useCallback(id => {- setHovered(id);- }, []);+ const onHover = useCallback(id => {+ setHovered(id);+ }, []);- return (- <View style={{ flex: 1 }} onMouseLeave={() => setHovered(null)}>- <Table- ref={ref}- items={payees}- navigator={navigator}- renderItem={({ item, editing, focusedField, onEdit }) => {- return (- <PayeeTableRow- payee={item}- ruleCount={ruleCounts.get(item.id) || 0}- selected={selectedItems.has(item.id)}- editing={editing}- focusedField={focusedField}- hovered={hovered === item.id}- onHover={onHover}- onEdit={onEdit}- onUpdate={onUpdate}- onViewRules={onViewRules}- onCreateRule={onCreateRule}- />- );- }}- />- </View>- );- },-);+ return (+ <View style={{ flex: 1 }} onMouseLeave={() => setHovered(null)}>+ <Table+ ref={ref}+ items={payees}+ renderItem={({ item, editing, focusedField, onEdit }) => {+ return (+ <PayeeTableRow+ payee={item}+ ruleCount={ruleCounts.get(item.id) || 0}+ selected={selectedItems.has(item.id)}+ editing={editing}+ focusedField={focusedField}+ hovered={hovered === item.id}+ onHover={onHover}+ onEdit={onEdit}+ onUpdate={onUpdate}+ onViewRules={onViewRules}+ onCreateRule={onCreateRule}+ />+ );+ }}+ />+ </View>+ );+});PayeeTable.displayName = 'PayeeTable';diff --git a/packages/desktop-client/src/components/payees/PayeeTableRow.tsx b/packages/desktop-client/src/components/payees/PayeeTableRow.tsxindex cd6fe5aeb2..b716d04bc9 100644--- a/packages/desktop-client/src/components/payees/PayeeTableRow.tsx+++ b/packages/desktop-client/src/components/payees/PayeeTableRow.tsx@@ -71,10 +71,10 @@ type PayeeTableRowProps = {focusedField: string;onHover?: (id: PayeeEntity['id']) => void;onEdit: (id: PayeeEntity['id'], field: string) => void;- onUpdate: (+ onUpdate: <T extends EditablePayeeFields>(id: PayeeEntity['id'],- field: EditablePayeeFields,- value: unknown,+ field: T,+ value: PayeeEntity[T],) => void;onViewRules: (id: PayeeEntity['id']) => void;onCreateRule: (id: PayeeEntity['id']) => void;diff --git a/packages/desktop-client/src/components/table.tsx b/packages/desktop-client/src/components/table.tsxindex 655c8f954e..b2ee1bb96e 100644--- a/packages/desktop-client/src/components/table.tsx+++ b/packages/desktop-client/src/components/table.tsx@@ -1212,7 +1212,7 @@ export const Table = forwardRef(// @ts-expect-error fix meTable.displayName = 'Table';-export type TableNavigator<T extends TableItem> = {+type TableNavigator<T extends TableItem> = {onEdit: (id: T['id'], field?: string) => void;editingId: T['id'];focusedField: string;diff --git a/packages/desktop-client/src/components/transactions/TransactionsTable.test.jsx b/packages/desktop-client/src/components/transactions/TransactionsTable.test.jsxindex a9644f9770..d8d58265f8 100644--- a/packages/desktop-client/src/components/transactions/TransactionsTable.test.jsx+++ b/packages/desktop-client/src/components/transactions/TransactionsTable.test.jsx@@ -40,20 +40,20 @@ const payees = [{id: 'bob-id',name: 'Bob',- favorite: true,+ favorite: 1,transfer_acct: null,category: null,},{id: 'alice-id',name: 'Alice',- favorite: true,+ favorite: 1,transfer_acct: null,category: null,},{id: 'guy',- favorite: false,+ favorite: 0,transfer_acct: null,category: null,name: 'This guy on the side of the road',diff --git a/packages/desktop-client/src/hooks/useStableCallback.ts b/packages/desktop-client/src/hooks/useStableCallback.tsdeleted file mode 100644index 9a09968750..0000000000--- a/packages/desktop-client/src/hooks/useStableCallback.ts+++ /dev/null@@ -1,16 +0,0 @@-// @ts-strict-ignore-import { useRef, useLayoutEffect, useCallback } from 'react';--type UseStableCallbackArg = (...args: unknown[]) => unknown;--export function useStableCallback(callback: UseStableCallbackArg) {- const callbackRef = useRef<UseStableCallbackArg>();- const memoCallback = useCallback(- (...args) => callbackRef.current && callbackRef.current(...args),- [],- );- useLayoutEffect(() => {- callbackRef.current = callback;- });- return memoCallback;-}diff --git a/packages/loot-core/src/shared/util.ts b/packages/loot-core/src/shared/util.tsindex 43dabd7537..04e33702c9 100644--- a/packages/loot-core/src/shared/util.ts+++ b/packages/loot-core/src/shared/util.ts@@ -148,7 +148,9 @@ export function diffItems<T extends { id: string }>(return { added, updated, deleted };}-export function groupById<T extends { id: string }>(data: T[]) {+export function groupById<T extends { id: string }>(+ data: T[],+): Record<string, T> {const res: { [key: string]: T } = {};for (let i = 0; i < data.length; i++) {const item = data[i];diff --git a/packages/loot-core/src/types/models/payee.d.ts b/packages/loot-core/src/types/models/payee.d.tsindex f55f04aa49..37e3f77bb0 100644--- a/packages/loot-core/src/types/models/payee.d.ts+++ b/packages/loot-core/src/types/models/payee.d.ts@@ -4,6 +4,6 @@ export interface PayeeEntity {id: string;name: string;transfer_acct?: AccountEntity['id'];- favorite?: boolean;+ favorite?: 1 | 0;tombstone?: boolean;}diff --git a/packages/loot-core/src/types/server-events.d.ts b/packages/loot-core/src/types/server-events.d.tsindex c53004a9ca..cd0dabf851 100644--- a/packages/loot-core/src/types/server-events.d.ts+++ b/packages/loot-core/src/types/server-events.d.ts@@ -1,7 +1,8 @@+import { type Backup } from '../server/backups';import { type UndoState } from '../server/undo';export interface ServerEvents {- 'backups-updated': unknown;+ 'backups-updated': Backup[];'cells-changed': Array<{ name }>;'fallback-write-error': unknown;'finish-import': unknown;diff --git a/upcoming-release-notes/3507.md b/upcoming-release-notes/3507.mdnew file mode 100644index 0000000000..f19343f344--- /dev/null+++ b/upcoming-release-notes/3507.md@@ -0,0 +1,6 @@+---+category: Maintenance+authors: [MatissJanis]+---++TypeScript: migrated `ManagePayees` and `LoadBackupModal`.