A local-first personal finance app
Fix `send` types in a number of places (1/2) (#4146)
Julian Dominguez-Schatzb1627d707327
diff --git a/packages/desktop-client/src/components/ServerContext.tsx b/packages/desktop-client/src/components/ServerContext.tsxindex c32ed2ac51..8e8d4681f1 100644--- a/packages/desktop-client/src/components/ServerContext.tsx+++ b/packages/desktop-client/src/components/ServerContext.tsx@@ -93,7 +93,11 @@ export function ServerProvider({ children }: { children: ReactNode }) {useEffect(() => {async function run() {- setServerURL(await send('get-server-url'));+ const serverURL = await send('get-server-url');+ if (!serverURL) {+ return;+ }+ setServerURL(serverURL);setVersion(await getServerVersion());}run();@@ -135,7 +139,8 @@ export function ServerProvider({ children }: { children: ReactNode }) {async (url: string, opts: { validate?: boolean } = {}) => {const { error } = await send('set-server-url', { ...opts, url });if (!error) {- setServerURL(await send('get-server-url'));+ const serverURL = await send('get-server-url');+ setServerURL(serverURL!);setVersion(await getServerVersion());}return { error };diff --git a/packages/desktop-client/src/components/admin/UserAccess/UserAccess.tsx b/packages/desktop-client/src/components/admin/UserAccess/UserAccess.tsxindex 736daad12e..4d4aba8789 100644--- a/packages/desktop-client/src/components/admin/UserAccess/UserAccess.tsx+++ b/packages/desktop-client/src/components/admin/UserAccess/UserAccess.tsx@@ -106,8 +106,9 @@ function UserAccessContent({}, [cloudFileId, setLoading, t]);const loadOwner = useCallback(async () => {- const file: Awaited<ReturnType<Handlers['get-user-file-info']>> =- (await send('get-user-file-info', cloudFileId as string)) ?? {};+ const file = (await send('get-user-file-info', cloudFileId as string)) ?? {+ usersWithAccess: [],+ };const owner = file?.usersWithAccess.filter(user => user.owner);if (owner.length > 0) {diff --git a/packages/desktop-client/src/components/admin/UserDirectory/UserDirectory.tsx b/packages/desktop-client/src/components/admin/UserDirectory/UserDirectory.tsxindex 2d57fc13de..328f4ebc40 100644--- a/packages/desktop-client/src/components/admin/UserDirectory/UserDirectory.tsx+++ b/packages/desktop-client/src/components/admin/UserDirectory/UserDirectory.tsx@@ -116,11 +116,24 @@ function UserDirectoryContent({setLoading(true);const loadedUsers = (await send('users-get')) ?? [];+ if ('error' in loadedUsers) {+ dispatch(+ addNotification({+ type: 'error',+ id: 'error',+ title: t('Error getting users'),+ sticky: true,+ message: getUserDirectoryErrors(loadedUsers.error),+ }),+ );+ setLoading(false);+ return;+ }setAllUsers(loadedUsers);setLoading(false);return loadedUsers;- }, [setLoading]);+ }, [dispatch, getUserDirectoryErrors, setLoading, t]);useEffect(() => {async function loadData() {@@ -141,9 +154,11 @@ function UserDirectoryContent({const onDeleteSelected = useCallback(async () => {setLoading(true);- const { error } = await send('user-delete-all', [...selectedInst.items]);+ const res = await send('user-delete-all', [...selectedInst.items]);- if (error) {+ const error = res['error'];+ const someDeletionsFailed = res['someDeletionsFailed'];+ if (error || someDeletionsFailed) {if (error === 'token-expired') {dispatch(addNotification({diff --git a/packages/desktop-client/src/components/filters/SavedFilterMenuButton.tsx b/packages/desktop-client/src/components/filters/SavedFilterMenuButton.tsxindex d6fd2e1002..56b7d0a40f 100644--- a/packages/desktop-client/src/components/filters/SavedFilterMenuButton.tsx+++ b/packages/desktop-client/src/components/filters/SavedFilterMenuButton.tsx@@ -42,7 +42,7 @@ export function SavedFilterMenuButton({const [adding, setAdding] = useState(false);const [menuOpen, setMenuOpen] = useState(false);const triggerRef = useRef(null);- const [err, setErr] = useState(null);+ const [err, setErr] = useState<string | null>(null);const [menuItem, setMenuItem] = useState('');const [name, setName] = useState(filterId?.name ?? '');const id = filterId?.id;diff --git a/packages/desktop-client/src/components/modals/CreateAccountModal.tsx b/packages/desktop-client/src/components/modals/CreateAccountModal.tsxindex 64597e2a00..afd8bb790e 100644--- a/packages/desktop-client/src/components/modals/CreateAccountModal.tsx+++ b/packages/desktop-client/src/components/modals/CreateAccountModal.tsx@@ -88,7 +88,7 @@ export function CreateAccountModal({ upgradingAccountId }: CreateAccountProps) {balance: number;};- for (const oldAccount of results.accounts) {+ for (const oldAccount of results.accounts ?? []) {const newAccount: NormalizedAccount = {account_id: oldAccount.id,name: oldAccount.name,diff --git a/packages/desktop-client/src/components/modals/EditUser.tsx b/packages/desktop-client/src/components/modals/EditUser.tsxindex 0e59ada14a..5fdb1d71a3 100644--- a/packages/desktop-client/src/components/modals/EditUser.tsx+++ b/packages/desktop-client/src/components/modals/EditUser.tsx@@ -83,12 +83,14 @@ function useSaveUser() {user: User,setError: (error: string) => void,): Promise<boolean> {- const { error, id: newId } = (await send(method, user)) || {};- if (!error) {+ const res = (await send(method, user)) || {};+ if (!res['error']) {+ const newId = res['id'];if (newId) {user.id = newId;}} else {+ const error = res['error'];setError(getUserDirectoryErrors(error));if (error === 'token-expired') {dispatch(diff --git a/packages/desktop-client/src/components/payees/ManagePayeesWithData.tsx b/packages/desktop-client/src/components/payees/ManagePayeesWithData.tsxindex 66ce987f31..2b9703637a 100644--- a/packages/desktop-client/src/components/payees/ManagePayeesWithData.tsx+++ b/packages/desktop-client/src/components/payees/ManagePayeesWithData.tsx@@ -35,9 +35,9 @@ export function ManagePayeesWithData({}, []);const refetchRuleCounts = useCallback(async () => {- let counts = await send('payees-get-rule-counts');- counts = new Map(Object.entries(counts));- setRuleCounts({ value: counts });+ const counts = await send('payees-get-rule-counts');+ const countsMap = new Map(Object.entries(counts));+ setRuleCounts({ value: countsMap });}, []);useEffect(() => {diff --git a/packages/desktop-client/src/components/reports/spreadsheets/calendar-spreadsheet.ts b/packages/desktop-client/src/components/reports/spreadsheets/calendar-spreadsheet.tsindex eb50c66fdf..71dee8760d 100644--- a/packages/desktop-client/src/components/reports/spreadsheets/calendar-spreadsheet.ts+++ b/packages/desktop-client/src/components/reports/spreadsheets/calendar-spreadsheet.ts@@ -34,7 +34,7 @@ export function calendarSpreadsheet(}[];}) => void,) => {- let filters;+ let filters: unknown[];try {const { filters: filtersLocal } = await send(diff --git a/packages/desktop-client/src/components/reports/spreadsheets/spending-spreadsheet.ts b/packages/desktop-client/src/components/reports/spreadsheets/spending-spreadsheet.tsindex 997bcd3a5a..6159a2bbf4 100644--- a/packages/desktop-client/src/components/reports/spreadsheets/spending-spreadsheet.ts+++ b/packages/desktop-client/src/components/reports/spreadsheets/spending-spreadsheet.ts@@ -109,7 +109,7 @@ export function createSpendingSpreadsheet({$and: [{ month: { $eq: budgetMonth } }],}).filter({- [conditionsOpKey]: filters.filter(filter => filter.category),+ [conditionsOpKey]: filters.filter(filter => filter['category']),}).groupBy([{ $id: '$category' }]).select([diff --git a/packages/desktop-client/src/components/reports/spreadsheets/summary-spreadsheet.ts b/packages/desktop-client/src/components/reports/spreadsheets/summary-spreadsheet.tsindex a4200d1ede..059ff0191d 100644--- a/packages/desktop-client/src/components/reports/spreadsheets/summary-spreadsheet.ts+++ b/packages/desktop-client/src/components/reports/spreadsheets/summary-spreadsheet.ts@@ -27,7 +27,7 @@ export function summarySpreadsheet(toRange: string;}) => void,) => {- let filters = [];+ let filters: unknown[] = [];try {const response = await send('make-filters-from-conditions', {conditions: conditions.filter(cond => !cond.customName),diff --git a/upcoming-release-notes/4146.md b/upcoming-release-notes/4146.mdnew file mode 100644index 0000000000..78c785e4cc--- /dev/null+++ b/upcoming-release-notes/4146.md@@ -0,0 +1,6 @@+---+category: Maintenance+authors: [jfdoming]+---++Fix `send` types in a number of places (1/2)